aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig/lexer.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-19 12:43:24 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-07-23 09:28:23 -0500
commitea250a5ef5dd3e790b22336e5a9e74c77da35569 (patch)
treeb002000a753c62c25b0762e5df1a374fd3384974 /phpBB/phpbb/template/twig/lexer.php
parent2d764ef7d54104be2925aa015193da20c4383c5d (diff)
downloadforums-ea250a5ef5dd3e790b22336e5a9e74c77da35569.tar
forums-ea250a5ef5dd3e790b22336e5a9e74c77da35569.tar.gz
forums-ea250a5ef5dd3e790b22336e5a9e74c77da35569.tar.bz2
forums-ea250a5ef5dd3e790b22336e5a9e74c77da35569.tar.xz
forums-ea250a5ef5dd3e790b22336e5a9e74c77da35569.zip
[ticket/11701] Refix regex for appending |length
PHPBB3-11701
Diffstat (limited to 'phpBB/phpbb/template/twig/lexer.php')
-rw-r--r--phpBB/phpbb/template/twig/lexer.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 95b3043403..3534311b7a 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -226,10 +226,10 @@ class phpbb_template_twig_lexer extends Twig_Lexer
$inner = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $inner);
// Replace .foo with loops.foo|length
- $inner = preg_replace('#\s\.([a-zA-Z_0-9]+) #', ' loops.$1|length ', $inner);
+ $inner = preg_replace('#\s\.([a-zA-Z_0-9]+)([^a-zA-Z_0-9\.])#', ' loops.$1|length$2', $inner);
// Replace .foo.bar with foo.bar|length
- $inner = preg_replace('#\s\.([a-zA-Z_0-9\.]+) #', ' $1|length ', $inner);
+ $inner = preg_replace('#\s\.([a-zA-Z_0-9\.]+)([^a-zA-Z_0-9\.])#', ' $1|length$2', $inner);
return "<!-- {$matches[1]}IF{$inner}-->";
};