diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-01-11 23:25:51 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-01-12 00:21:04 +0100 |
| commit | 6b1e343d8dae618afd0cb04173749f005c10e376 (patch) | |
| tree | 20a820f330dde99b3c2eac0c57a812c86a789cf9 /phpBB/install/install_install.php | |
| parent | 106f6800d4d898f079129e85fd6763c199dae9ec (diff) | |
| download | forums-6b1e343d8dae618afd0cb04173749f005c10e376.tar forums-6b1e343d8dae618afd0cb04173749f005c10e376.tar.gz forums-6b1e343d8dae618afd0cb04173749f005c10e376.tar.bz2 forums-6b1e343d8dae618afd0cb04173749f005c10e376.tar.xz forums-6b1e343d8dae618afd0cb04173749f005c10e376.zip | |
[task/config-class] Always specify the config table to use.
PHPBB3-9988
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index e47c8b8c01..01ed223c27 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1461,7 +1461,9 @@ class install_install extends module include_once($phpbb_root_path . 'includes/search/fulltext_native.' . $phpEx); // We need to fill the config to let internal functions correctly work - $config = new phpbb_config_db($db, new phpbb_cache_driver_null); + $config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE); + set_config(null, null, null, $config); + set_config_count(null, null, null, $config); $error = false; $search = new fulltext_native($error); @@ -1821,17 +1823,10 @@ class install_install extends module // Obtain any submitted data $data = $this->get_submitted_data(); - // Fill the config array - it is needed by those functions we call - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); + // We need to fill the config to let internal functions correctly work + $config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE); + set_config(null, null, null, $config); + set_config_count(null, null, null, $config); $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " @@ -1898,19 +1893,10 @@ class install_install extends module $this->page_title = $lang['STAGE_FINAL']; - // Obtain any submitted data - $data = $this->get_submitted_data(); - - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); + // We need to fill the config to let internal functions correctly work + $config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE); + set_config(null, null, null, $config); + set_config_count(null, null, null, $config); $user->session_begin(); $auth->login($data['admin_name'], $data['admin_pass1'], false, true, true); |