makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10975] Avoid rewriting global config twice.

Browse source 
PHPBB3-10975
This commit is contained in:
Oleg Pudeyev 2012-12-13 07:28:01 -05:00
parent c5f350906d
commit 4de07338ef
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/test_framework/phpbb_functional_test_case.php
View file

@ -251,16 +251,12 @@ class phpbb_functional_test_case extends phpbb_test_case
// Required by unique_id // Required by unique_id
global $config; global $config;
if (!is_array($config)) $config = new phpbb_config(array());
{
$config = array();
}
$config['rand_seed'] = ''; $config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600; $config['rand_seed_last_update'] = time() + 600;
// Required by user_add // Required by user_add
global $db, $cache, $config, $phpbb_dispatcher; global $db, $cache, $phpbb_dispatcher;
$db = $this->get_db(); $db = $this->get_db();
if (!function_exists('phpbb_mock_null_cache')) if (!function_exists('phpbb_mock_null_cache'))
{ {
@ -276,7 +272,6 @@ class phpbb_functional_test_case extends phpbb_test_case
{ {
require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
} }
$config = new phpbb_config(array());
set_config(null, null, null, $config); set_config(null, null, null, $config);
set_config_count(null, null, null, $config); set_config_count(null, null, null, $config);
$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher();