Merge branch 'develop-olympus' into develop

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

6 files changed, 26 insertions, 105 deletions

diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html
index aec5c010fd..82237d21a3 100644
--- a/tests/template/templates/define.html
+++ b/tests/template/templates/define.html
@@ -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 -->
diff --git a/tests/template/templates/expressions.html b/tests/template/templates/expressions.html
index 47a164e481..c40d967dab 100644
--- a/tests/template/templates/expressions.html
+++ b/tests/template/templates/expressions.html
@@ -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 -->
diff --git a/tests/template/templates/if.html b/tests/template/templates/if.html
index 8ec3e66449..c502e52f51 100644
--- a/tests/template/templates/if.html
+++ b/tests/template/templates/if.html
@@ -6,6 +6,6 @@
 0
 <!-- ENDIF -->
 
-<!-- IF !!(S_VALUE > S_OTHER_VALUE) -->
+<!-- IF (S_VALUE > S_OTHER_VALUE) -->
 0
 <!-- ENDIF -->
diff --git a/tests/template/templates/loop.html b/tests/template/templates/loop.html
index f1e1bf7e53..de1a10004d 100644
--- a/tests/template/templates/loop.html
+++ b/tests/template/templates/loop.html
@@ -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 -->
diff --git a/tests/template/templates/loop_advanced.html b/tests/template/templates/loop_advanced.html
index 1ed70f28c5..c75fe55f03 100644
--- a/tests/template/templates/loop_advanced.html
+++ b/tests/template/templates/loop_advanced.html
@@ -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 -->
diff --git a/tests/template/templates/loop_vars.html b/tests/template/templates/loop_vars.html
index 1ecf49bdf2..4f02fd2e6c 100644
--- a/tests/template/templates/loop_vars.html
+++ b/tests/template/templates/loop_vars.html
@@ -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 -->