diff options
| author | rechosen <rechosen@gmail.com> | 2013-09-13 12:05:20 +0200 |
|---|---|---|
| committer | rechosen <rechosen@gmail.com> | 2013-09-13 12:05:20 +0200 |
| commit | 42884546cc743cc83f8153b7cc889381b0a69077 (patch) | |
| tree | 955bb60a92d18c34bdd5f957423e0674ada0298d /phpBB | |
| parent | fc7a35be38caa52df29b7126a57d461efd5a5d06 (diff) | |
| download | forums-42884546cc743cc83f8153b7cc889381b0a69077.tar forums-42884546cc743cc83f8153b7cc889381b0a69077.tar.gz forums-42884546cc743cc83f8153b7cc889381b0a69077.tar.bz2 forums-42884546cc743cc83f8153b7cc889381b0a69077.tar.xz forums-42884546cc743cc83f8153b7cc889381b0a69077.zip | |
[ticket/11843] The twig lexer fixes DEFINE variables with underscores again
https://github.com/phpbb/phpbb3/pull/1708 accidentally stopped the twig lexer
from fixing DEFINE variables with underscores in them. This commit restores
that functionality.
PHPBB3-11843
Diffstat (limited to '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 8b72a06642..16a693cd7c 100644 --- a/phpBB/phpbb/template/twig/lexer.php +++ b/phpBB/phpbb/template/twig/lexer.php @@ -75,7 +75,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer // Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}') $code = $this->fix_inline_variable_tokens(array( - 'DEFINE \$[a-zA-Z0-9]+ =', + 'DEFINE \$[a-zA-Z0-9_]+ =', 'INCLUDE', 'INCLUDEPHP', 'INCLUDEJS', |