1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 14:16:28 +02:00

Merge PR branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11323] Add tests for inclusion of defined variables
This commit is contained in:
Oleg Pudeyev
2013-01-13 20:12:06 -05:00
3 changed files with 25 additions and 1 deletions

@ -196,7 +196,25 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
array('loop'),
'',
),/* no top level nested loops
),
/* Currently fail on develop:
http://tracker.phpbb.com/browse/PHPBB3-11323
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(
'loop_vars.html',
array(),

@ -0,0 +1,2 @@
<!-- DEFINE $DEF = '{VARIABLE}' -->
<!-- INCLUDE {$DEF} -->

@ -0,0 +1,4 @@
<!-- BEGIN loop -->
<!-- DEFINE $DEF = '{loop.NESTED_FILE}' -->
<!-- INCLUDE {$DEF} -->
<!-- END loop -->