mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +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

2
tests/request/all_tests.php
View File

@@ -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();
}

3
tests/request/request_var.php
View File

@@ -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
}
}