diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-12 01:49:44 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-12 01:49:44 +0100 |
| commit | a3673789402eae83b94860c87747091125701f78 (patch) | |
| tree | c95893f38eb1c52df491e2bab2b986bb51f21883 /phpBB/install/install_update.php | |
| parent | 30dacf8e4e313355c4694db2455e453a0ed62a11 (diff) | |
| parent | f11579549d0250733f4a2bd1759adc2db6d587d3 (diff) | |
| download | forums-a3673789402eae83b94860c87747091125701f78.tar forums-a3673789402eae83b94860c87747091125701f78.tar.gz forums-a3673789402eae83b94860c87747091125701f78.tar.bz2 forums-a3673789402eae83b94860c87747091125701f78.tar.xz forums-a3673789402eae83b94860c87747091125701f78.zip | |
Merge branch 'task/naderman/config-class' into develop
* task/naderman/config-class:
[task/config-class] Do not create multiple cache driver instances.
[task/config-class] Add an attribute for the table name in phpbb_config_db.
[task/config-class] Correctly merge cached config with dynamically loaded data.
[task/config-class] Always specify the config table to use.
[task/config-class] Fix db config constructor param order
[task/config-class] Implemented a config class to replace the global array.
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 2e78803b74..5c3a38d237 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -101,17 +101,10 @@ class install_update extends module // We do not need this any longer, unset for safety purposes unset($dbpasswd); - $config = array(); - - $sql = 'SELECT config_name, config_value - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - 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); // Force template recompile $config['load_tplcompile'] = 1; |