diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-10 16:41:45 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-10 16:43:42 +0100 |
| commit | 2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6 (patch) | |
| tree | 571928cd4420aad6d04bcc0b78ca3193f8dbaaf9 /tests/request | |
| parent | f8d134eb7070fa189d5c9aeb3f4401563188b1e0 (diff) | |
| parent | 60bd1edcb5e5992e6e693d0f68db47e678f7d54a (diff) | |
| download | forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar.gz forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar.bz2 forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar.xz forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.zip | |
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
Diffstat (limited to 'tests/request')
| -rw-r--r-- | tests/request/all_tests.php | 2 | ||||
| -rw-r--r-- | tests/request/request_var.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/request/all_tests.php b/tests/request/all_tests.php index dc5d26417f..1ee3029b36 100644 --- a/tests/request/all_tests.php +++ b/tests/request/all_tests.php @@ -2,7 +2,6 @@ /** * * @package testing -* @version $Id$ * @copyright (c) 2008 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @@ -39,3 +38,4 @@ if (PHPUnit_MAIN_METHOD == 'phpbb_request_all_tests::main') { phpbb_request_all_tests::main(); } + diff --git a/tests/request/request_var.php b/tests/request/request_var.php index c0f8a22d95..0f24d77034 100644 --- a/tests/request/request_var.php +++ b/tests/request/request_var.php @@ -2,7 +2,6 @@ /** * * @package testing -* @version $Id$ * @copyright (c) 2008 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @@ -112,6 +111,7 @@ class phpbb_request_request_var_test extends phpbb_test_case ); } */ + public static function request_variables() { return array( @@ -262,3 +262,4 @@ class phpbb_request_request_var_test extends phpbb_test_case } } + |