mirror of
https://github.com/retailcrm/PHPExcel.git
synced 2024-11-25 23:06:03 +03:00
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:
parent
1ec263ee94
commit
56d7506cf5
@ -174,7 +174,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
|
||||
//
|
||||
|
||||
$signature = array(
|
||||
'<?xml version="1.0"?>',
|
||||
'<?xml version="1.0"',
|
||||
'<?mso-application progid="Excel.Sheet"?>'
|
||||
);
|
||||
|
||||
@ -188,16 +188,10 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
|
||||
$data = fread($fh, 2048);
|
||||
fclose($fh);
|
||||
|
||||
$headers = explode("\n",$data);
|
||||
$valid = true;
|
||||
foreach($signature as $key => $match) {
|
||||
if (isset($headers[$key])) {
|
||||
$line = trim(rtrim($headers[$key], "\r\n"));
|
||||
if ($line != $match) {
|
||||
$valid = false;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
foreach($signature as $match) {
|
||||
// every part of the signature must be present
|
||||
if (strpos($data, $match) === false) {
|
||||
$valid = false;
|
||||
break;
|
||||
}
|
||||
|
@ -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 14029 - Excel 2007 Reader /writer lost fontcolor
|
||||
- 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.
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user