diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2015-03-09 12:07:10 +0100 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2015-04-02 19:16:03 +0200 |
| commit | b46bf9f02f8d1810bdb95d64603632b6fab06960 (patch) | |
| tree | af23fbd4e12ebdc1b5d008c432811d80b917d38e /phpBB/phpbb/textformatter | |
| parent | 709d5023324da66543bbea2f62e4d50bddc49246 (diff) | |
| download | forums-b46bf9f02f8d1810bdb95d64603632b6fab06960.tar forums-b46bf9f02f8d1810bdb95d64603632b6fab06960.tar.gz forums-b46bf9f02f8d1810bdb95d64603632b6fab06960.tar.bz2 forums-b46bf9f02f8d1810bdb95d64603632b6fab06960.tar.xz forums-b46bf9f02f8d1810bdb95d64603632b6fab06960.zip | |
[ticket/11768] Updated merge_templates(). No functional change intended
PHPBB3-11768
Diffstat (limited to 'phpBB/phpbb/textformatter')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/factory.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index f3df2ad7a5..b053fd6468 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -480,7 +480,7 @@ class factory implements \phpbb\textformatter\cache_interface $grouped_templates = array(); foreach ($style_templates as $style_id => $style_template) { - $grouped_templates[$style_template][] = $style_id; + $grouped_templates[$style_template][] = '$STYLE_ID=' . $style_id; } if (count($grouped_templates) === 1) @@ -499,9 +499,9 @@ class factory implements \phpbb\textformatter\cache_interface // Build an xsl:choose switch $template = '<xsl:choose>'; - foreach ($grouped_templates as $style_template => $style_ids) + foreach ($grouped_templates as $style_template => $exprs) { - $template .= '<xsl:when test="$STYLE_ID=' . implode(' or $STYLE_ID=', $style_ids) . '">' . $style_template . '</xsl:when>'; + $template .= '<xsl:when test="' . implode(' or ', $exprs) . '">' . $style_template . '</xsl:when>'; } $template .= '<xsl:otherwise>' . $default_template . '</xsl:otherwise></xsl:choose>'; |