Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change regex instead of checking twice

Browse Source
This commit is contained in:
troosan 2018-12-29 14:56:11 +01:00
parent 7c8cfb7b8a
commit 5057617de7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/PhpWord/TemplateProcessor.php
View File

@ -612,8 +612,7 @@ class TemplateProcessor
// If tmpXmlRow doesn't contain continue, this row is no longer part of the spanned row. // If tmpXmlRow doesn't contain continue, this row is no longer part of the spanned row.
$tmpXmlRow = $this->getSlice($extraRowStart, $extraRowEnd); $tmpXmlRow = $this->getSlice($extraRowStart, $extraRowEnd);
if (!preg_match('#<w:vMerge/>#', $tmpXmlRow) && if (!preg_match('#<w:vMerge/>#', $tmpXmlRow) &&
!preg_match('#<w:vMerge w:val="continue" />#', $tmpXmlRow) && !preg_match('#<w:vMerge w:val="continue"\s*/>#', $tmpXmlRow)) {
!preg_match('#<w:vMerge w:val="continue"/>#', $tmpXmlRow)) {
break; break;
} }
// This row was a spanned row, update $rowEnd and search for the next row. // This row was a spanned row, update $rowEnd and search for the next row.