diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-03 12:47:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-03 12:47:30 +0200 |
| commit | df38b2829a60a0353a2c9f46646f71d11446ff9f (patch) | |
| tree | 3161cd71988e9c8893977431addf416d733ef0b7 /phpBB/phpbb | |
| parent | 492c0d890e517011624855b62aa22d039db6f2a1 (diff) | |
| parent | a0e00889d1a03804625522405824ac8cbce15c22 (diff) | |
| download | forums-df38b2829a60a0353a2c9f46646f71d11446ff9f.tar forums-df38b2829a60a0353a2c9f46646f71d11446ff9f.tar.gz forums-df38b2829a60a0353a2c9f46646f71d11446ff9f.tar.bz2 forums-df38b2829a60a0353a2c9f46646f71d11446ff9f.tar.xz forums-df38b2829a60a0353a2c9f46646f71d11446ff9f.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12781] Add tests
[ticket/12781] Template regex for IF catch too many things
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/template/twig/lexer.php | 2 |
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); } /** |