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

Bugfix: Work item 15537 - Excel2007 Reader canRead function bug 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@70501 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-03-17 11:29:14 +00:00
parent 9704feec19
commit a0ac293ec6
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Classes/PHPExcel/Reader/Excel2007.php
View File

@ -200,14 +200,16 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
if ($zip->open($pFilename) === true) { if ($zip->open($pFilename) === true) {
// check if it is an OOXML archive // check if it is an OOXML archive
$rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels")); $rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels"));
foreach ($rels->Relationship as $rel) { if ($rels) {
switch ($rel["Type"]) { foreach ($rels->Relationship as $rel) {
case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument": switch ($rel["Type"]) {
if (basename($rel["Target"]) == 'workbook.xml') { case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
$xl = true; if (basename($rel["Target"]) == 'workbook.xml') {
} $xl = true;
break; }
break;
}
} }
} }
$zip->close(); $zip->close();

1
changelog.txt
View File

@ -26,6 +26,7 @@
Fixed in SVN: Fixed in SVN:
- Bugfix: (MBaker) Work item 15459 - Invalid cell coordinate in Autofilter for Excel2007 Writer - Bugfix: (MBaker) Work item 15459 - Invalid cell coordinate in Autofilter for Excel2007 Writer
- Bugfix: (MBaker) Work item 15518 - PCLZip library issue - Bugfix: (MBaker) Work item 15518 - PCLZip library issue
- Bugfix: (MBaker) Work item 15537 - Excel2007 Reader canRead function bug
- 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