Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#548.

This commit is contained in:
Roman Syroeshko 2016-04-09 22:03:21 +04:00
parent 28f801b5d0
commit 1c5bb3a911
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -39,6 +39,8 @@ so installation via ZIP-archive download is not an option anymore. To install PH
### Fixed ### Fixed
- `Undefined property` error while reading MS-DOC documents. - @jaberu #610 - `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

2
src/PhpWord/TemplateProcessor.php
View File

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