diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-03 00:15:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-03 00:15:37 +0200 |
| commit | 67f89cc319998ee0feb5dba013a3bac452f1d4b7 (patch) | |
| tree | a2bba10073cb4fc3266ba0567bf78707faf8cd94 /phpBB/phpbb | |
| parent | f9c3d78e8c4370141618a361a56403cd5103ec73 (diff) | |
| parent | c8d5ec892745f9bfc784cd8f7f632fee4a371ff7 (diff) | |
| download | forums-67f89cc319998ee0feb5dba013a3bac452f1d4b7.tar forums-67f89cc319998ee0feb5dba013a3bac452f1d4b7.tar.gz forums-67f89cc319998ee0feb5dba013a3bac452f1d4b7.tar.bz2 forums-67f89cc319998ee0feb5dba013a3bac452f1d4b7.tar.xz forums-67f89cc319998ee0feb5dba013a3bac452f1d4b7.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11812' into develop
* EXreaction/ticket/11812:
[ticket/11812] Fix empty define
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 a33de70d69..7ab569313c 100644 --- a/phpBB/phpbb/template/twig/lexer.php +++ b/phpBB/phpbb/template/twig/lexer.php @@ -130,7 +130,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer // E.g. 'asdf'"' -> asdf'" // E.g. "asdf'"" -> asdf'" // E.g. 'asdf'" -> 'asdf'" - $matches[2] = preg_replace('#^([\'"])?(.+?)\1$#', '$2', $matches[2]); + $matches[2] = preg_replace('#^([\'"])?(.*?)\1$#', '$2', $matches[2]); // Replace template variables with start/end to parse variables (' ~ TEST ~ '.html) $matches[2] = preg_replace('#{([a-zA-Z0-9_\.$]+)}#', "'~ \$1 ~'", $matches[2]); |