detect actual filename of document xml (prevent mismatching document22.xml as in #1253)

2018-10-11 08:55:38 +02:00 · 2018-10-11 08:55:38 +02:00 · 7f55816eba
parent 18760620b3
commit 7f55816eba
1 changed files with 7 additions and 1 deletions
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@ -507,7 +507,13 @@ class TemplateProcessor
     */
    protected function getMainPartName()
    {
-        return 'word/document.xml';
+        $contentTypes = $this->zipClass->getFromName('[Content_Types].xml');
+
+        $pattern = '~PartName="\/(word\/document.*?\.xml)" ContentType="application\/vnd\.openxmlformats-officedocument\.wordprocessingml\.document\.main\+xml"~';
+
+        preg_match($pattern, $contentTypes, $m);
+        
+        return (array_key_exists(1, $m) ? $m[1] : 'word/document.xml');
    }

    /**