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

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10011] Tests don't work on PHP < 5.3

Conflicts:
	tests/security/redirect_test.php
This commit is contained in:
Andreas Fischer
2011-01-31 13:26:20 +01:00
parent 7ff0cff4cd e685c1c005
commit d06657c995
18 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/security/extract_current_page_test.php
View File

@@ -7,10 +7,10 @@
*
*/
require_once __DIR__ . '/base.php';
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/session.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
class phpbb_security_extract_current_page_test extends phpbb_security_test_base
{

10
tests/security/redirect_test.php
View File

@@ -7,9 +7,10 @@
*
*/
require_once __DIR__ . '/base.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/session.php';
require_once dirname(__FILE__) . '/base.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
class phpbb_security_redirect_test extends phpbb_security_test_base
{
@@ -29,7 +30,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
protected function setUp()
{
parent::setUp();
$GLOBALS['config'] = array(
'force_server_vars' => '0',
);
@@ -56,4 +57,3 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
}
}
}