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/style.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/style.php')
| -rw-r--r-- | phpBB/style.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/style.php b/phpBB/style.php index cff91a2312..9f8b77c1f5 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -66,8 +66,8 @@ if ($id) // set up caching $cache_factory = new phpbb_cache_factory($acm_type); - $class_loader->set_cache($cache_factory->get_driver()); $cache = $cache_factory->get_service(); + $class_loader->set_cache($cache->get_driver()); $request = new phpbb_request(); $db = new $sql_db(); @@ -82,7 +82,10 @@ if ($id) } unset($dbpasswd); - $config = $cache->obtain_config(); + $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE); + set_config(null, null, null, $config); + set_config_count(null, null, null, $config); + $user = false; // try to get a session ID from REQUEST array |