diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-27 17:39:08 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-27 17:39:08 +0200 |
| commit | fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04 (patch) | |
| tree | 72b56ee01d74483a507722ca36be012b2e7e96e5 /tests | |
| parent | 5e768036f773e461283d0f65841d2ff0618ec7b7 (diff) | |
| parent | 1f140130930e40dcf3e6693feb1b53d14e46d098 (diff) | |
| download | forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar.gz forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar.bz2 forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar.xz forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.zip | |
Merge remote-tracking branch 'github-cs278/ticket/10392' into develop
* github-cs278/ticket/10392:
[ticket/10392] Alter parent namespace stripping.
[ticket/10392] Test for magic loop variables with nested namespaces.
[ticket/10392] Missed fix for S_BLOCK_NAME.
[ticket/10392] Fix access to nested special block variables.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/template/template_test.php | 2 | ||||
| -rw-r--r-- | tests/template/templates/loop_nested_deep_multilevel_ref.html | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 28eba05217..cf772a5284 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -248,7 +248,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case array('outer' => array(array()), 'outer.middle' => array(array()), 'outer.middle.inner' => array(array('VARIABLE' => 'z'), array('VARIABLE' => 'zz'))), array(), // I don't completely understand this output, hopefully it's correct - "top-level content\nouter\n\ninner z\nfirst row\n\ninner zz", + "top-level content\nouter\nmiddle\ninner z\nfirst row of 2 in inner\n\ninner zz", ), array( 'loop_size.html', diff --git a/tests/template/templates/loop_nested_deep_multilevel_ref.html b/tests/template/templates/loop_nested_deep_multilevel_ref.html index 60fad7b4cd..bcc2a7c07b 100644 --- a/tests/template/templates/loop_nested_deep_multilevel_ref.html +++ b/tests/template/templates/loop_nested_deep_multilevel_ref.html @@ -2,10 +2,11 @@ top-level content <!-- BEGIN outer --> outer <!-- BEGIN middle --> + {outer.middle.S_BLOCK_NAME} <!-- BEGIN inner --> inner {inner.VARIABLE} <!-- IF outer.middle.inner.S_FIRST_ROW --> - first row + first row of {outer.middle.inner.S_NUM_ROWS} in {middle.inner.S_BLOCK_NAME} <!-- ENDIF --> <!-- END inner --> <!-- END middle --> |