mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-12 14:28:56 +00:00
Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympus
# By Marc Alexander # Via Marc Alexander * marc1706/ticket/11323: [ticket/11323] Add tests for inclusion of defined variables
This commit is contained in:
commit
227f7f46df
3 changed files with 22 additions and 1 deletions
|
@ -238,7 +238,22 @@ class phpbb_template_template_test extends phpbb_test_case
|
||||||
array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
|
array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
|
||||||
array('loop'),
|
array('loop'),
|
||||||
'',
|
'',
|
||||||
),/* no top level nested loops
|
),
|
||||||
|
array(
|
||||||
|
'include_define_variable.html',
|
||||||
|
array('VARIABLE' => 'variable.html'),
|
||||||
|
array(),
|
||||||
|
array(),
|
||||||
|
'variable.html',
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'include_loop_define.html',
|
||||||
|
array('VARIABLE' => 'value'),
|
||||||
|
array('loop' => array(array('NESTED_FILE' => 'variable.html'))),
|
||||||
|
array(),
|
||||||
|
'value',
|
||||||
|
),
|
||||||
|
/* no top level nested loops
|
||||||
array(
|
array(
|
||||||
'loop_vars.html',
|
'loop_vars.html',
|
||||||
array(),
|
array(),
|
||||||
|
|
2
tests/template/templates/include_define_variable.html
Normal file
2
tests/template/templates/include_define_variable.html
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
<!-- DEFINE $DEF = '{VARIABLE}' -->
|
||||||
|
<!-- INCLUDE {$DEF} -->
|
4
tests/template/templates/include_loop_define.html
Normal file
4
tests/template/templates/include_loop_define.html
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<!-- BEGIN loop -->
|
||||||
|
<!-- DEFINE $DEF = '{loop.NESTED_FILE}' -->
|
||||||
|
<!-- INCLUDE {$DEF} -->
|
||||||
|
<!-- END loop -->
|
Loading…
Add table
Reference in a new issue