Changeset 3675

Show
Ignore:
Timestamp:
01/29/08 23:49:31 (17 months ago)
Author:
guilhermeblanco
Message:

Merged changeset #3593 into 0.9 and 0.10 branches

Location:
branches
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • branches/0.10/lib/Doctrine/Parser/spyc.php

    r2963 r3675  
    511511      $line = trim($line); 
    512512 
     513      if(!preg_match("/\\\#/", $line)) {  
     514        $line = trim(preg_replace('/#.*$/', '', $line));  
     515      } 
     516 
    513517      $array = array(); 
    514518 
  • branches/0.9/lib/Doctrine/Parser/spyc.php

    r2963 r3675  
    511511      $line = trim($line); 
    512512 
     513      if(!preg_match("/\\\#/", $line)) {  
     514        $line = trim(preg_replace('/#.*$/', '', $line));  
     515      } 
     516 
    513517      $array = array(); 
    514518