diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 07:28:01 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 07:30:00 -0500 |
| commit | 4de07338efcd4f0d390df0f2d7fa883712d8c942 (patch) | |
| tree | 6bf73b1492ec5bc3689d99c1420db206916d20ab /tests/test_framework | |
| parent | c5f350906d0470e54ca7ade935b4bee841acdbed (diff) | |
| download | forums-4de07338efcd4f0d390df0f2d7fa883712d8c942.tar forums-4de07338efcd4f0d390df0f2d7fa883712d8c942.tar.gz forums-4de07338efcd4f0d390df0f2d7fa883712d8c942.tar.bz2 forums-4de07338efcd4f0d390df0f2d7fa883712d8c942.tar.xz forums-4de07338efcd4f0d390df0f2d7fa883712d8c942.zip | |
[ticket/10975] Avoid rewriting global config twice.
PHPBB3-10975
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 9097854bd4..b6f8e5c44c 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -251,16 +251,12 @@ class phpbb_functional_test_case extends phpbb_test_case // Required by unique_id global $config; - if (!is_array($config)) - { - $config = array(); - } - + $config = new phpbb_config(array()); $config['rand_seed'] = ''; $config['rand_seed_last_update'] = time() + 600; // Required by user_add - global $db, $cache, $config, $phpbb_dispatcher; + global $db, $cache, $phpbb_dispatcher; $db = $this->get_db(); 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'); } - $config = new phpbb_config(array()); set_config(null, null, null, $config); set_config_count(null, null, null, $config); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); |