diff options
| author | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
|---|---|---|
| committer | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
| commit | e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806 (patch) | |
| tree | 0c7421d14d3f803358740a2febb84bc06acd4dac /tests/template/templates | |
| parent | 564a7cc89dcd2464024b78fe2e70adef771368f2 (diff) | |
| parent | 717e2337b9276d9f9680110dff552ea536d0723c (diff) | |
| download | forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.gz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.bz2 forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.xz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786
Diffstat (limited to 'tests/template/templates')
| -rw-r--r-- | tests/template/templates/define.html | 12 | ||||
| -rw-r--r-- | tests/template/templates/if.html | 2 | ||||
| -rw-r--r-- | tests/template/templates/include_define_variable.html | 6 |
3 files changed, 20 insertions, 0 deletions
diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html index 66e874ca63..bc20c02ed1 100644 --- a/tests/template/templates/define.html +++ b/tests/template/templates/define.html @@ -7,6 +7,15 @@ $VALUE != 'abc' <!-- ELSEIF $VALUE == 'abc' --> $VALUE == 'abc' <!-- ENDIF --> +<!-- IF ($VALUE == 'abc') --> +($VALUE == 'abc') +<!-- ENDIF --> +<!-- IF !$DOESNT_EXIST --> +!$DOESNT_EXIST +<!-- ENDIF --> +<!-- IF (!$DOESNT_EXIST) --> +(!$DOESNT_EXIST) +<!-- ENDIF --> <!-- INCLUDE define_include.html --> {$INCLUDED_VALUE} {$VALUE} @@ -14,3 +23,6 @@ $VALUE == 'abc' {$VALUE} <!-- DEFINE $VALUE = 'test!@#$%^&*()_-=+{}[]:;",<.>/?' --> {$VALUE} +<!-- DEFINE $VALUE = '' --> +[{$VALUE}] +<!-- DEFINE $TEST -->foobar<!-- ENDDEFINE -->|{$TEST}| 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 --> diff --git a/tests/template/templates/include_define_variable.html b/tests/template/templates/include_define_variable.html index aff9b574c2..6052657c97 100644 --- a/tests/template/templates/include_define_variable.html +++ b/tests/template/templates/include_define_variable.html @@ -1,2 +1,8 @@ <!-- DEFINE $DEF = '{VARIABLE}' --> <!-- INCLUDE {$DEF} --> + +<!-- DEFINE $DEF_WITH_UNDERSCORES = '{VARIABLE}' --> +<!-- INCLUDE {$DEF_WITH_UNDERSCORES} --> + +<!-- DEFINE $DEF123 = '{VARIABLE}' --> +<!-- INCLUDE {$DEF123} --> |