Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TemplateProcessor cloneBlock wrongly clones images #1763

Merged
merged 3 commits into from
Feb 7, 2021
Merged

TemplateProcessor cloneBlock wrongly clones images #1763

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9ea617
Fixes #1750 added proper block cloning to put the image size part aft…
Nov 28, 2019
0945a37
Fixed block capture so that it would work properly with blocks to be …
Dec 2, 2019
d9cb88e
Merge branch 'develop' into fixes-1750-block-with-images-inside
troosan Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/PhpWord/TemplateProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ protected function indexClonedVariables($count, $xmlBlock)
{
$results = array();
for ($i = 1; $i <= $count; $i++) {
$results[] = preg_replace('/\$\{(.*?)\}/', '\${\\1#' . $i . '}', $xmlBlock);
$results[] = preg_replace('/\$\{([^:]*?)(:.*?)?\}/', '\${\1#' . $i . '\2}', $xmlBlock);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was just wondering why you're only using one \ compared to the old regex and to my changes in #1829:

$results[] = preg_replace('/\$\{(.*?)(:([^}])*)?\}/', '\${\\1#' . $i . '\\2}', $xmlBlock);

I'm not that much into this regex at the moment, so I don't know how they differ.

btw, this pr will also fix #1624

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Amerlander that's because in a single quoted string you don't have to double the
https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for explanation and for the merge! :)

}

return $results;
Expand Down