#548.

Author: Roman Syroeshko

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
 
 
 

src/PhpWord/TemplateProcessor.php

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