| 1864 |
raphael |
1 |
diff --git a/Classes/PHPExcel/Reader/CSV.php b/Classes/PHPExcel/Reader/CSV.php
|
|
|
2 |
index d43b374..d45a0c6 100644
|
|
|
3 |
--- a/Classes/PHPExcel/Reader/CSV.php
|
|
|
4 |
+++ b/Classes/PHPExcel/Reader/CSV.php
|
|
|
5 |
@@ -144,28 +144,28 @@ public function getInputEncoding()
|
|
|
6 |
*/
|
|
|
7 |
protected function _skipBOM()
|
|
|
8 |
{
|
|
|
9 |
- rewind($fileHandle);
|
|
|
10 |
+ rewind($this->_fileHandle);
|
|
|
11 |
|
|
|
12 |
switch ($this->_inputEncoding) {
|
|
|
13 |
case 'UTF-8':
|
|
|
14 |
fgets($this->_fileHandle, 4) == "\xEF\xBB\xBF" ?
|
|
|
15 |
- fseek($this->_fileHandle, 3) : fseek($this->_fileHandle, 0);
|
|
|
16 |
+ fseek($this->_fileHandle, 3) : fseek($this->_fileHandle, 0);
|
|
|
17 |
break;
|
|
|
18 |
case 'UTF-16LE':
|
|
|
19 |
fgets($this->_fileHandle, 3) == "\xFF\xFE" ?
|
|
|
20 |
- fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
|
|
|
21 |
+ fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
|
|
|
22 |
break;
|
|
|
23 |
case 'UTF-16BE':
|
|
|
24 |
fgets($this->_fileHandle, 3) == "\xFE\xFF" ?
|
|
|
25 |
- fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
|
|
|
26 |
+ fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
|
|
|
27 |
break;
|
|
|
28 |
case 'UTF-32LE':
|
|
|
29 |
fgets($this->_fileHandle, 5) == "\xFF\xFE\x00\x00" ?
|
|
|
30 |
- fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
|
|
|
31 |
+ fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
|
|
|
32 |
break;
|
|
|
33 |
case 'UTF-32BE':
|
|
|
34 |
fgets($this->_fileHandle, 5) == "\x00\x00\xFE\xFF" ?
|
|
|
35 |
- fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
|
|
|
36 |
+ fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
|
|
|
37 |
break;
|
|
|
38 |
default:
|
|
|
39 |
break;
|
|
|
40 |
@@ -187,7 +187,7 @@ public function listWorksheetInfo($pFilename)
|
|
|
41 |
throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
|
|
|
42 |
}
|
|
|
43 |
$fileHandle = $this->_fileHandle;
|
|
|
44 |
-
|
|
|
45 |
+
|
|
|
46 |
// Skip BOM, if any
|
|
|
47 |
$this->_skipBOM();
|
|
|
48 |
|