aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-05-03 00:20:37 +0200
committerNils Adermann <naderman@naderman.de>2014-05-03 00:20:37 +0200
commitc5660ed177d05cd1139546833b2888115ec15ce8 (patch)
treede7346ee85cc94ffe574c16fe99da1fad18c1d93 /tests/template
parentd18f19a3bbe764218f391932464e841b3f554c73 (diff)
downloadforums-c5660ed177d05cd1139546833b2888115ec15ce8.tar
forums-c5660ed177d05cd1139546833b2888115ec15ce8.tar.gz
forums-c5660ed177d05cd1139546833b2888115ec15ce8.tar.bz2
forums-c5660ed177d05cd1139546833b2888115ec15ce8.tar.xz
forums-c5660ed177d05cd1139546833b2888115ec15ce8.zip
[ticket/12382] Event loop nesting inclusion applies to regular includes too
PHPBB3-12382
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/template_test.php1
-rw-r--r--tests/template/templates/loop_nested_include1.html4
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 49804c26c5..0d19e7afd1 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -330,7 +330,6 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
array(),
"[bar|[bar|]][bar1|[bar1|[bar1|works]]]",
array(),
- 'Included files are missing opened parent loops: PHPBB3-12382',
),
/* Does not pass with the current implementation.
array(
diff --git a/tests/template/templates/loop_nested_include1.html b/tests/template/templates/loop_nested_include1.html
index 0f1a180b4d..88efffc99c 100644
--- a/tests/template/templates/loop_nested_include1.html
+++ b/tests/template/templates/loop_nested_include1.html
@@ -1,5 +1,5 @@
[{test_loop.foo}|
-<!-- BEGIN inner -->
+<!-- BEGIN test_loop.inner -->
[{test_loop.foo}|
{test_loop.inner.myinner}]
-<!-- END inner -->]
+<!-- END test_loop.inner -->]