Indefero Commit Details

Date:

2012-05-03 18:01:33 (13 years 5 months ago)

Author:

Thomas Keller

Branch:

develop, release-1.3

Commit:

dd2fa6f90290c91bda577fc7c2a9bfc1398edb7b

Parents:

b6acf4c0e20738fd224ae28a392b029221c89f95

Message:

Remove OS9 line ending support again, this was left out for a reason. Fix tests after issue 804 was fixed.

Changes:

File differences

-147
148 148
149 149
150
151
150 152
151 153
152 154
... ...
155 157
156 158
157 159
158 
160
159 161
160 162
161 163
+     * Splits a string into separate lines while retaining the individual␊
     * line ending character for every line.␊
     *␊
     * OS 9 line endings are not supported.␊
     *␊
     * @param string content␊
     * @param boolean if true, skip completely empty lines␊
     * @return string␊

    {␊
        $last_off = 0;␊
        $lines = array();␊
        while (preg_match("/\r\n|\n|\r/", $content, $m, PREG_OFFSET_CAPTURE, $last_off)) {␊
        while (preg_match("/\r\n|\n/", $content, $m, PREG_OFFSET_CAPTURE, $last_off)) {␊
            $next_off = strlen($m[0][0]) + $m[0][1];␊
            $line = substr($content, $last_off, $next_off - $last_off);␊
            $last_off = $next_off;␊
 ...
      * Splits a string into separate lines while retaining the individual␊
      * line ending character for every line.␊
      *␊
+     * OS 9 line endings are not supported.␊
+     *␊
      * @param string content␊
      * @param boolean if true, skip completely empty lines␊
      * @return string␊
     {␊
         $last_off = 0;␊
         $lines = array();␊
-        while (preg_match("/\r\n|\n|\r/", $content, $m, PREG_OFFSET_CAPTURE, $last_off)) {␊
+        while (preg_match("/\r\n|\n/", $content, $m, PREG_OFFSET_CAPTURE, $last_off)) {␊
             $next_off = strlen($m[0][0]) + $m[0][1];␊
             $line = substr($content, $last_off, $next_off - $last_off);␊
             $last_off = $next_off;␊

-80
81 81
82 82
83 
84 83
85 84
86 85
... ...
102 101
103 102
104 103
105 
104
+=> '',␊
          1 => 11,␊
          2 => '␊
␍␊
',␊
        ),␊
      ),␊

      ),␊
    ),␊
  ),␊
);
);␊
 ...
 => '',␊
 => 11,␊
 => '␊
-␍␊
 ',␊
         ),␊
       ),␊
       ),␊
     ),␊
   ),␊
-);
+);␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags