From ff22d7a3687791fb4659f4808b4425a78d8bfc71 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Sun, 23 Nov 2008 03:41:54 +0000 Subject: Refactor and fix :) git-svn-id: file:///svn/phpbb/trunk@9093 89ea8834-ac86-4346-8a33-228a782c2dd0 --- tests/security/redirect.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/security') diff --git a/tests/security/redirect.php b/tests/security/redirect.php index 2474d62355..0cf67b7aef 100644 --- a/tests/security/redirect.php +++ b/tests/security/redirect.php @@ -19,14 +19,6 @@ define('PHP_EXT', 'php'); require_once '../phpBB/includes/functions.php'; require_once '../phpBB/includes/session.php'; -if (!isset($config)) -{ - $config = array(); -} -$config += array( - 'force_server_vars' => 0, -); - class phpbb_security_redirect_test extends PHPUnit_Extensions_OutputTestCase { protected $error_triggered = false; @@ -44,6 +36,13 @@ class phpbb_security_redirect_test extends PHPUnit_Extensions_OutputTestCase ); } + protected function setUp() + { + $GLOBALS['config'] = array( + 'force_server_vars' => 0, + ); + } + /** * Own error handler to catch trigger_error() calls within phpBB */ -- cgit v1.2.1