aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig/lexer.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-27 16:04:56 +0200
committerTristan Darricau <github@nicofuma.fr>2014-06-27 16:04:56 +0200
commit6d40b876617422dbca1cb9c0d6b6ac9b43ea1ca3 (patch)
tree64103670658e41aff98de46df7cbb511803469ce /phpBB/phpbb/template/twig/lexer.php
parent9b27d00d5fc8228ec4f9150aa26bcf450dc45524 (diff)
downloadforums-6d40b876617422dbca1cb9c0d6b6ac9b43ea1ca3.tar
forums-6d40b876617422dbca1cb9c0d6b6ac9b43ea1ca3.tar.gz
forums-6d40b876617422dbca1cb9c0d6b6ac9b43ea1ca3.tar.bz2
forums-6d40b876617422dbca1cb9c0d6b6ac9b43ea1ca3.tar.xz
forums-6d40b876617422dbca1cb9c0d6b6ac9b43ea1ca3.zip
[ticket/12781] Template regex for IF catch too many things
PHPBB3-12781
Diffstat (limited to 'phpBB/phpbb/template/twig/lexer.php')
-rw-r--r--phpBB/phpbb/template/twig/lexer.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index cceefda7ef..c5dc7273ba 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -285,7 +285,7 @@ class lexer extends \Twig_Lexer
return "<!-- {$matches[1]}IF{$inner}-->";
};
- return preg_replace_callback('#<!-- (ELSE)?IF((.*?) \(*!?[\$|\.]([^\s]+)(.*?))-->#', $callback, $code);
+ return preg_replace_callback('#<!-- (ELSE)?IF((.*?) (?:\(*!?[\$|\.]([^\s]+)(.*?))?)-->#', $callback, $code);
}
/**