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

fix Parser::parsePairs always escapes #1417

Merged
merged 1 commit into from
Nov 7, 2018
Merged

fix Parser::parsePairs always escapes #1417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion system/View/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ protected function parsePair(string $variable, array $data, string $template): a
}

$temp = [];
$pairs = [];
$out = $match[1];
foreach ($row as $key => $val)
{
Expand All @@ -382,6 +383,7 @@ protected function parsePair(string $variable, array $data, string $template): a

if ( ! empty($pair))
{
$pairs[array_keys( $pair )[0]] = true;
$temp = array_merge($temp, $pair);
}

Expand All @@ -402,7 +404,7 @@ protected function parsePair(string $variable, array $data, string $template): a
// Now replace our placeholders with the new content.
foreach ($temp as $pattern => $content)
{
$out = $this->replaceSingle($pattern, $content, $out, true);
$out = $this->replaceSingle($pattern, $content, $out, !isset( $pairs[$pattern] ) );
}

$str .= $out;
Expand Down