mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
Conflicts:
	tests/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/security/all_tests.php
	tests/security/extract_current_page.php
	tests/security/redirect.php
	tests/template/all_tests.php
	tests/template/template.php
	tests/template/templates/define.html
	tests/template/templates/expressions.html
	tests/template/templates/if.html
	tests/template/templates/includephp.html
	tests/template/templates/loop.html
	tests/template/templates/loop_advanced.html
	tests/template/templates/loop_vars.html
	tests/test_framework/framework.php
	tests/test_framework/phpbb_test_case.php
	tests/text_processing/all_tests.php
	tests/text_processing/make_clickable.php
	tests/utf/all_tests.php
	tests/utf/utf8_clean_string_test.php
	tests/utf/utf8_wordwrap_test.php
This commit is contained in:
Nils Adermann
2010-03-10 16:41:45 +01:00
parent f8d134eb70 60bd1edcb5
commit 2ed9d7878e
21 changed files with 149 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/template/templates/define.html
View File

@@ -1,41 +1,8 @@
<!-- DEFINE $VALUE = 'xyz' -->
{$VALUE}
<!-- DEFINE $VALUE = 'abc' -->
{$VALUE}
<!-- UNDEFINE $VALUE -->
{$VALUE}
<!-- DEFINE $VALUE -->
<!-- BEGIN loop -->
<!-- DEFINE loop.$VALUE = loop.S_ROW_NUM -->
{loop.$VALUE}
<!-- UNDEFINE $VALUE -->
{loop.$VALUE}
<!-- UNDEFINE loop.$VALUE -->
{loop.$VALUE}
<!-- END loop -->
<!-- BEGIN test -->
<!-- BEGIN deep -->
<!-- BEGIN defines -->
<!-- DEFINE test.deep.defines.$VALUE = 12 * 12 -->
{test.deep.defines.$VALUE}
<!-- UNDEFINE $VALUE -->
{test.deep.defines.$VALUE}
<!-- UNDEFINE test.deep.defines.$VALUE -->
{test.deep.defines.$VALUE}
<!-- END defines -->
<!-- END deep -->
<!-- END test -->

2
tests/template/templates/expressions.html
View File

@@ -76,8 +76,6 @@
<!-- IF !false -->pass<!-- ELSE -->fail<!-- ENDIF -->
<!-- IF !! true -->pass<!-- ELSE -->fail<!-- ENDIF -->
<!-- IF not false -->pass<!-- ELSE -->fail<!-- ENDIF -->
<!-- IF not not not false -->pass<!-- ELSE -->fail<!-- ENDIF -->

2
tests/template/templates/if.html
View File

@@ -6,6 +6,6 @@
0
<!-- ENDIF -->
<!-- IF !!(S_VALUE > S_OTHER_VALUE) -->
<!-- IF (S_VALUE > S_OTHER_VALUE) -->
0
<!-- ENDIF -->

4
tests/template/templates/loop.html
View File

@@ -16,8 +16,6 @@ loop
<!-- BEGIN loop -->
<!-- BEGIN !block -->
loop#{loop.S_ROW_NUM}-block#{block.S_ROW_NUM}
loop#{loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT}
<!-- END !block -->
<!-- END loop -->

78
tests/template/templates/loop_advanced.html
View File

@@ -1,59 +1,19 @@
<!-- BEGIN loop -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(0) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(0,-1) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(1) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(1,1) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(0,1) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(2,4) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(0,-7) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(-2,6) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop(-2,-1) -->
{loop.S_FIRST_ROW}
{loop.S_ROW_NUM}
{loop.S_LAST_ROW}
<!-- END loop -->
<!-- BEGIN loop -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(0) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(0,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(1,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(0,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(2,4) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(0,-7) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(-2,6) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
x
<!-- BEGIN loop(-2,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->

12
tests/template/templates/loop_vars.html
View File

@@ -3,20 +3,18 @@
{loop.S_ROW_COUNT}
{loop.S_ROW_NUM}
{loop.S_NUM_ROWS}
{loop.VARIABLE}
<!-- IF loop.VARIABLE -->set<!-- ENDIF -->
<!-- IF loop.S_LAST_ROW -->last<!-- ENDIF -->
<!-- IF loop.S_LAST_ROW -->
last
<!-- ENDIF -->
<!-- BEGIN inner -->
{inner.S_ROW_NUM}
{inner.S_ROW_COUNT}
<!-- IF inner.S_LAST_ROW and inner.S_ROW_NUM and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
<!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
<!-- END inner -->
<!-- END loop -->