aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-01-22 20:32:07 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-01-22 20:32:07 +0100
commita83c766ebde91aa516fb94f1ac498bac9db4803e (patch)
tree1518b1cce16d8f8a8e21b5473e8b12dae705b46b /tests
parente9a3f090742d0acaa42bc0e381e8b1860a296eec (diff)
parent90235754b3919eafcb47047a8aac0fa0f075087e (diff)
downloadforums-a83c766ebde91aa516fb94f1ac498bac9db4803e.tar
forums-a83c766ebde91aa516fb94f1ac498bac9db4803e.tar.gz
forums-a83c766ebde91aa516fb94f1ac498bac9db4803e.tar.bz2
forums-a83c766ebde91aa516fb94f1ac498bac9db4803e.tar.xz
forums-a83c766ebde91aa516fb94f1ac498bac9db4803e.zip
Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympus
* p/ticket/11323-olympus: [ticket/11323] Backport include_define test to olympus.
Diffstat (limited to 'tests')
-rw-r--r--tests/template/template_test.php7
-rw-r--r--tests/template/templates/include_define.html2
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 291b424bdd..e532de294c 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -233,6 +233,13 @@ class phpbb_template_template_test extends phpbb_test_case
'value',
),
array(
+ 'include_define.html',
+ array('VARIABLE' => 'value'),
+ array(),
+ array(),
+ 'value',
+ ),
+ array(
'loop_vars.html',
array(),
array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
diff --git a/tests/template/templates/include_define.html b/tests/template/templates/include_define.html
new file mode 100644
index 0000000000..2419c8cba1
--- /dev/null
+++ b/tests/template/templates/include_define.html
@@ -0,0 +1,2 @@
+<!-- DEFINE $DEF = 'variable.html' -->
+<!-- INCLUDE {$DEF} -->