Merge remote-tracking branch 'EXreaction/ticket/10288' into develop

* EXreaction/ticket/10288:
  [ticket/10288] Test to make sure included templates have proper variable scope

tests/template/template_test.php

@@ -306,6 +306,13 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array(),
 				"nonexistent = 0\n! nonexistent\n\nempty = 0\n! empty\nloop\n\nin loop",
 			),
+			array(
+				'loop_include.html',
+				array(),
+				array('test_loop' => array(array('foo' => 'bar'), array('foo' => 'bar1'))),
+				array(),
+				"barbarbar1bar1",
+			),
 			/* Does not pass with the current implementation.
 			array(
 				'loop_reuse.html',

tests/template/templates/loop_include.html

@@ -0,0 +1,4 @@
+<!-- BEGIN test_loop -->
+{test_loop.foo}
+	<!-- INCLUDE loop_include1.html -->
+<!-- END test_loop -->

tests/template/templates/loop_include1.html

@@ -0,0 +1 @@
+{test_loop.foo}