alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Minor patchfix for Excel2003XML Reader when XML is defined with a charset attribute 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@66707 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-01-10 17:51:55 +00:00
parent 1ec263ee94
commit 56d7506cf5
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Classes/PHPExcel/Reader/Excel2003XML.php
View File

@ -174,7 +174,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
// //
$signature = array( $signature = array(
'<?xml version="1.0"?>', '<?xml version="1.0"',
'<?mso-application progid="Excel.Sheet"?>' '<?mso-application progid="Excel.Sheet"?>'
); );
@ -188,16 +188,10 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
$data = fread($fh, 2048); $data = fread($fh, 2048);
fclose($fh); fclose($fh);
$headers = explode("\n",$data);
$valid = true; $valid = true;
foreach($signature as $key => $match) { foreach($signature as $match) {
if (isset($headers[$key])) { // every part of the signature must be present
$line = trim(rtrim($headers[$key], "\r\n")); if (strpos($data, $match) === false) {
if ($line != $match) {
$valid = false;
break;
}
} else {
$valid = false; $valid = false;
break; break;
} }

1
changelog.txt
View File

@ -39,6 +39,7 @@ Fixed in SVN:
- Bugfix: (MBaker) Work item 13215 - Formatting get lost and edit a template XLSX file - Bugfix: (MBaker) Work item 13215 - Formatting get lost and edit a template XLSX file
- Bugfix: (MBaker) Work item 14029 - Excel 2007 Reader /writer lost fontcolor - Bugfix: (MBaker) Work item 14029 - Excel 2007 Reader /writer lost fontcolor
- Bugfix: (MBaker) Work item 13374 - file that makes cells go black - Bugfix: (MBaker) Work item 13374 - file that makes cells go black
- Bugfix: (MBaker) Minor patchfix for Excel2003XML Reader when XML is defined with a charset attribute
- General: (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer. - General: (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.