From 8af620f97b8b1c8a677d90b3d7203fa562050db1 Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Thu, 14 Apr 2016 23:19:40 +0100 Subject: [PATCH] GH-879 Bug in file PHPExcel/Reader/CSV.php Code logic identifying a defined separator when no separator is explicitly defined Case-insensitive check when separator is explicitly defined --- Classes/PHPExcel/Reader/CSV.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/PHPExcel/Reader/CSV.php b/Classes/PHPExcel/Reader/CSV.php index 194240f..21329da 100644 --- a/Classes/PHPExcel/Reader/CSV.php +++ b/Classes/PHPExcel/Reader/CSV.php @@ -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(); } /**