diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-30 19:53:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-30 19:53:54 +0200 |
| commit | 9d6370751f1b998e3da448e16c1446b33ddd17d0 (patch) | |
| tree | 42cd824be2e41034a05542bbe66a4ba3f721d9bb /tests | |
| parent | afc12906b92c2cf126fa2ff9006583d0c4ef01ec (diff) | |
| parent | 38a7aac0cceee521fbf2550750a85b4d6bf80ec1 (diff) | |
| download | forums-9d6370751f1b998e3da448e16c1446b33ddd17d0.tar forums-9d6370751f1b998e3da448e16c1446b33ddd17d0.tar.gz forums-9d6370751f1b998e3da448e16c1446b33ddd17d0.tar.bz2 forums-9d6370751f1b998e3da448e16c1446b33ddd17d0.tar.xz forums-9d6370751f1b998e3da448e16c1446b33ddd17d0.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11724' into develop
* EXreaction/ticket/11724:
[ticket/11724] Handle ELSE IF separately
[ticket/11724] Replace spaces with tabs
[ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/template/template_test.php | 7 | ||||
| -rw-r--r-- | tests/template/templates/if.html | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 15d75f09af..38eb072df8 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -64,6 +64,13 @@ class phpbb_template_template_test extends phpbb_template_template_test_case ), array( 'if.html', + array('S_OTHER_OTHER_VALUE' => true), + array(), + array(), + '|S_OTHER_OTHER_VALUE|!false', + ), + array( + 'if.html', array('S_VALUE' => false, 'S_OTHER_VALUE' => true), array(), array(), diff --git a/tests/template/templates/if.html b/tests/template/templates/if.html index c010aff7fa..f6ab6e575a 100644 --- a/tests/template/templates/if.html +++ b/tests/template/templates/if.html @@ -2,6 +2,8 @@ 1 <!-- ELSEIF S_OTHER_VALUE --> 2 +<!-- ELSE IF S_OTHER_OTHER_VALUE --> +|S_OTHER_OTHER_VALUE| <!-- ELSE --> 03 <!-- ENDIF --> |