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

Bugfix: Work item 16246 - reader/CSV fails on this file

Browse Source 
auto_detect_line_endings now set in CSV reader

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@77805 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-08-05 14:37:30 +00:00
parent bb34668146
commit f2310e05d0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,6 +217,9 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
} }
$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex ); $objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
$lineEnding = ini_set('auto_detect_line_endings');
ini_set('auto_detect_line_endings', true);
// Open file // Open file
$fileHandle = fopen($pFilename, 'r'); $fileHandle = fopen($pFilename, 'r');
if ($fileHandle === false) { if ($fileHandle === false) {
@ -287,6 +290,8 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
$this->_contiguousRow = $currentRow; $this->_contiguousRow = $currentRow;
} }
ini_set('auto_detect_line_endings', $lineEnding);
// Return // Return
return $objPHPExcel; return $objPHPExcel;
} // function loadIntoExisting() } // function loadIntoExisting()

2
changelog.txt
View File

@ -36,6 +36,8 @@ Fixed in SVN:
- Bugfix: (MBaker) Work item 15786 - RangeToArray strange array keys - Bugfix: (MBaker) Work item 15786 - RangeToArray strange array keys
- Bugfix: (MBaker) Work item 15762 - INDIRECT() function doesn't work with named ranges - Bugfix: (MBaker) Work item 15762 - INDIRECT() function doesn't work with named ranges
- Bugfix: (MBaker) Locale-specific fix to text functions when passing a boolean argument instead of a string - Bugfix: (MBaker) Locale-specific fix to text functions when passing a boolean argument instead of a string
- Bugfix: (MBaker) Work item 16246 - reader/CSV fails on this file
auto_detect_line_endings now set in CSV reader
- General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC) - General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC)
- General: (MBaker) Work item 15461 - Locale file paths not fit for windows - General: (MBaker) Work item 15461 - Locale file paths not fit for windows