cvs: pear /File/File CSV.php

dufuz Sat May 12 00:14:20 2007 UTC

Modified files:
/pear/File/File CSV.php
Log:
Account for the fact that it could be Mac only

http://cvs.php.net/viewvc.cgi/pear/F...&diff_format=u
Index: pear/File/File/CSV.php
diff -u pear/File/File/CSV.php:1.36 pear/File/File/CSV.php:1.37
--- pear/File/File/CSV.php:1.36 Fri May 11 23:52:14 2007
+++ pear/File/File/CSV.php Sat May 12 00:14:20 2007
@@ -18,7 +18,7 @@
* @author Helgi Þormar <dufuz@php.net>
* @copyright 2004-2005 The Authors
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: CSV.php,v 1.36 2007/05/11 23:52:14 dufuz Exp $
+ * @version CVS: $Id: CSV.php,v 1.37 2007/05/12 00:14:20 dufuz Exp $
* @link http://pear.php.net/package/File
*/

@@ -520,8 +520,9 @@
while ($lines != ($newLines = preg_replace('|((["\'])[^"]*(\2))|', '\2_\2', $lines))){
$lines = $newLines;
}
-
- $lines = explode("\n", $lines);
+
+ $eol = strpos($lines, "\r") ? "\r" : "\n";
+ $lines = explode($eol, $lines);
foreach ($lines as $line) {
$orgLine = $line;
foreach ($seps as $sep) {