diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2013-07-23 04:24:05 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 04:24:05 +0200 |
| commit | 7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989 (patch) | |
| tree | d80b5ec9b416c1f080273e59445a1f44e1634c6c /tests/template/template_test.php | |
| parent | Merge remote-tracking branch 'asperous/ticket/11620' into develop (diff) | |
| parent | [ticket/11718] Quick test for fixes in ELSEIF (diff) | |
| download | phpbb-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.tar.gz phpbb-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.tar.bz2 phpbb-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
* EXreaction/ticket/11718:
[ticket/11718] Quick test for fixes in ELSEIF
[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
Conflicts:
tests/template/template_test.php
Diffstat (limited to 'tests/template/template_test.php')
| -rw-r--r-- | tests/template/template_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 2ed0f03698..dd9ba21c26 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -151,7 +151,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case array(), array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())), array(), - "xyz\nabc\nabc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?", + "xyz\nabc\n\$VALUE == 'abc'abc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?", ), array( 'define_advanced.html', |