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_convert.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_convert.php')
| -rw-r--r-- | phpBB/install/install_convert.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 7aae5bf28c..7837353cfa 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -130,7 +130,9 @@ class install_convert extends module unset($dbpasswd); // 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); // Detect if there is already a conversion in progress at this point and offer to resume // It's quite possible that the user will get disconnected during a large conversion so they need to be able to resume it @@ -341,7 +343,9 @@ class install_convert extends module $this->page_title = $lang['STAGE_SETTINGS']; // 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); $convertor_tag = request_var('tag', ''); @@ -580,7 +584,9 @@ class install_convert extends module unset($dbpasswd); // 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); // Override a couple of config variables for the duration $config['max_quote_depth'] = 0; |