RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-21 21:06:06 +03:00
Code Issues Projects Releases Wiki Activity

GH-879 Bug in file PHPExcel/Reader/CSV.php

Browse Source 
Code logic identifying a defined separator when no separator is explicitly defined
Case-insensitive check when separator is explicitly defined
This commit is contained in:
MarkBaker 2016-04-14 23:19:40 +01:00
parent c4782b6606
commit 8af620f97b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Classes/PHPExcel/Reader/CSV.php
View File

@ -168,10 +168,11 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
return;
}
if ((strlen(trim($line)) == 5) && (strpos($line, 'sep=') !== 0)) {
return $this->skipBOM();
if ((strlen(trim($line, "\r\n")) == 5) && (stripos($line, 'sep=') === 0)) {
$this->delimiter = substr($line, 4, 1);
return;
}
$this->delimiter = substr($line, 4, 1);
return $this->skipBOM();
}
/**