diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-03-07 19:10:19 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-03-07 19:10:19 +0100 |
| commit | a0930e78c649deba5d8b28b368bd485ff9ce7e76 (patch) | |
| tree | c68249f937b7d57c8f21596009750610a8b272cf /tests/template/templates | |
| parent | a444eec47395104bb437ec1af5526f990a349f75 (diff) | |
| parent | 5646d657120f500419753ac089a2d0973b17e1fc (diff) | |
| download | forums-a0930e78c649deba5d8b28b368bd485ff9ce7e76.tar forums-a0930e78c649deba5d8b28b368bd485ff9ce7e76.tar.gz forums-a0930e78c649deba5d8b28b368bd485ff9ce7e76.tar.bz2 forums-a0930e78c649deba5d8b28b368bd485ff9ce7e76.tar.xz forums-a0930e78c649deba5d8b28b368bd485ff9ce7e76.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10081] remove $phpEx.
[ticket/10081] Cleanup Template Tests.
Diffstat (limited to 'tests/template/templates')
| -rw-r--r-- | tests/template/templates/includephp.html | 2 | ||||
| -rw-r--r-- | tests/template/templates/loop_nested.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/template/templates/includephp.html b/tests/template/templates/includephp.html index 117d4273f0..70ebdac0d0 100644 --- a/tests/template/templates/includephp.html +++ b/tests/template/templates/includephp.html @@ -1 +1 @@ -<!-- INCLUDEPHP ../templates/_dummy_include.php.inc --> +<!-- INCLUDEPHP ../tests/template/templates/_dummy_include.php.inc --> diff --git a/tests/template/templates/loop_nested.html b/tests/template/templates/loop_nested.html index 571df97b4c..9b251cd453 100644 --- a/tests/template/templates/loop_nested.html +++ b/tests/template/templates/loop_nested.html @@ -1,8 +1,8 @@ <!-- BEGIN outer --> - {outer.S_BLOCK_NAME} - {outer.S_ROW_NUM}/{outer.S_NUM_ROWS}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF --> + outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF --> <!-- BEGIN middle --> - {middle.S_BLOCK_NAME} - {middle.S_ROW_NUM}/{middle.S_NUM_ROWS}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF --> + middle - {middle.S_ROW_COUNT}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF --> <!-- END middle --> <!-- END outer --> |