makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[task/config-class] Always specify the config table to use.

Browse source 
PHPBB3-9988
This commit is contained in:
Nils Adermann 2011-01-11 23:25:51 +01:00
parent 106f6800d4
commit 6b1e343d8d
8 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/common.php
View file

@ -227,7 +227,7 @@ $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('
unset($dbpasswd);
// Grab global variables, re-cache if necessary
$config = new phpbb_config_db($db, $cache_factory->get_driver());
$config = new phpbb_config_db($db, $cache_factory->get_driver(), CONFIG_TABLE);
set_config(null, null, null, $config);
set_config_count(null, null, null, $config);

2
phpBB/download/file.php
View file

@ -70,7 +70,7 @@ if (isset($_GET['avatar']))
// worst-case default
$browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : 'msie 6.0';
$config = new phpbb_config_db($db, $cache_factory->get_driver());
$config = new phpbb_config_db($db, $cache_factory->get_driver(), CONFIG_TABLE);
set_config(null, null, null, $config);
set_config_count(null, null, null, $config);

2
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View file

@ -154,7 +154,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
$config_old = $config;
$config = new phpbb_config(array());
foreach ($old_config as $key => $value)
foreach ($config_old as $key => $value)
{
$config->set($key, $value);
}

2
phpBB/install/database_update.php
View file

@ -165,7 +165,7 @@ include($phpbb_root_path . 'language/' . $language . '/install.' . $phpEx);
$inline_update = (request_var('type', 0)) ? true : false;
// To let set_config() calls succeed, we need to make the config array available globally
$config = new phpbb_config_db($db, $cache_factory->get_driver());
$config = new phpbb_config_db($db, $cache_factory->get_driver(), CONFIG_TABLE);
set_config(null, null, null, $config);
set_config_count(null, null, null, $config);

12
phpBB/install/install_convert.php
View file

@ -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;

36
phpBB/install/install_install.php
View file

@ -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);

4
phpBB/install/install_update.php
View file

@ -102,7 +102,9 @@ class install_update 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);
// Force template recompile
$config['load_tplcompile'] = 1;

2
phpBB/style.php
View file

@ -82,7 +82,7 @@ if ($id)
}
unset($dbpasswd);
$config = new phpbb_config_db($db, $cache_factory->get_driver());
$config = new phpbb_config_db($db, $cache_factory->get_driver(), CONFIG_TABLE);
set_config(null, null, null, $config);
set_config_count(null, null, null, $config);