#548.

2016-04-09 22:03:21 +04:00 · 2016-04-09 22:03:21 +04:00 · 1c5bb3a911
parent 28f801b5d0
commit 1c5bb3a911
2 changed files with 3 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -39,6 +39,8 @@ so installation via ZIP-archive download is not an option anymore. To install PH

 ### Fixed
 - `Undefined property` error while reading MS-DOC documents. - @jaberu #610
+- Corrupted OOXML template issue in case when its macro is broken immediately after `$` sign.
+That case wasn't taken into account in implementation of `TemplateProcessor::fixBrokenMacros()`. - @RomanSyroeshko @d-damien #548



--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@ -385,7 +385,7 @@ class TemplateProcessor
        $fixedDocumentPart = $documentPart;

        $fixedDocumentPart = preg_replace_callback(
-            '|\$\{([^\}]+)\}|U',
+            '|\$[^{]*\{[^}]*\}|U',
            function ($match) {
                return strip_tags($match[0]);
            },