aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-09-12 20:51:29 -0700
committerDavid King <imkingdavid@gmail.com>2013-09-12 20:51:29 -0700
commit12ede5f2a783bbdb8dc8ba9a94b4cd1ffa750e49 (patch)
tree7a864eedaa2da42f147bedac8fbea0e5d6e1abe8 /tests/template
parent484d45736304921e7225b8726de5c048b430b5bf (diff)
parent8c2f73bb09dc1fa305b59c2adabdc47fd3d5afdb (diff)
downloadforums-12ede5f2a783bbdb8dc8ba9a94b4cd1ffa750e49.tar
forums-12ede5f2a783bbdb8dc8ba9a94b4cd1ffa750e49.tar.gz
forums-12ede5f2a783bbdb8dc8ba9a94b4cd1ffa750e49.tar.bz2
forums-12ede5f2a783bbdb8dc8ba9a94b4cd1ffa750e49.tar.xz
forums-12ede5f2a783bbdb8dc8ba9a94b4cd1ffa750e49.zip
Merge pull request #1708 from EXreaction/ticket/11828
[ticket/11828] Fix greedy operators in lexer
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/template_test.php2
-rw-r--r--tests/template/templates/define.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index f2e3903458..e64493e59a 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -158,7 +158,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
array(),
array('test_loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
array(),
- "xyz\nabc\n\$VALUE == 'abc'abc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?\n[]",
+ "xyz\nabc\n\$VALUE == 'abc'abc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?\n[]|foobar|",
),
array(
'define_advanced.html',
diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html
index e6c8ef49c9..f519078a5b 100644
--- a/tests/template/templates/define.html
+++ b/tests/template/templates/define.html
@@ -16,3 +16,4 @@ $VALUE == 'abc'
{$VALUE}
<!-- DEFINE $VALUE = '' -->
[{$VALUE}]
+<!-- DEFINE $TEST -->foobar<!-- ENDDEFINE -->|{$TEST}|