From c0b9db1c626c88780b2ee5f5a237561a125c54aa Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Jul 2013 14:10:11 -0500
Subject: [ticket/11701] Fix loops var check

PHPBB3-11701
---
 phpBB/phpbb/template/twig/lexer.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 3c072adff9..4f127bd7e6 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -200,8 +200,9 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 				$subset = '|subset(' . $subset . ')';
 			}
 
+			$parent = ($parent) ?: 'loops.';
 			// Turn into a Twig for loop
-			return "{% for {$name} in loops.{$parent}{$name}{$subset} %}{$body}{% endfor %}";
+			return "{% for {$name} in {$parent}{$name}{$subset} %}{$body}{% endfor %}";
 		};
 
 		// Replace <!-- BEGINELSE --> correctly, only needs to be done once
@@ -224,7 +225,10 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			// Replace $TEST with definition.TEST
 			$inner = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $inner);
 
-			// Replace .test with test|length
+			// Replace .foo with loops.foo|length
+			$inner = preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' loops.$1|length', $inner);
+
+			// Replace .foo.bar with foo.bar|length
 			$inner = preg_replace('#\s\.([a-zA-Z_0-9\.]+)#', ' $1|length', $inner);
 
 			return "<!-- {$matches[1]}IF{$inner}-->";
-- 
cgit v1.2.1