diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 18:13:20 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 18:13:20 +0100 |
| commit | 284aa8c496d658c196a0dfa3c90657415ee4c2ee (patch) | |
| tree | 6ea6f60315c6ac672b194ea0e22288d77d7f9815 /phpBB/install | |
| parent | 3fb6d5b838c33dc31563de7febbe827647f85abc (diff) | |
| parent | a633f3484c63fe4bd70df548b3ae4bd569bdef46 (diff) | |
| download | forums-284aa8c496d658c196a0dfa3c90657415ee4c2ee.tar forums-284aa8c496d658c196a0dfa3c90657415ee4c2ee.tar.gz forums-284aa8c496d658c196a0dfa3c90657415ee4c2ee.tar.bz2 forums-284aa8c496d658c196a0dfa3c90657415ee4c2ee.tar.xz forums-284aa8c496d658c196a0dfa3c90657415ee4c2ee.zip | |
Merge pull request #3281 from MGaetan89/ticket/13496
[ticket/13496] Change set_config_count() calls with $config->increment()
* MGaetan89/ticket/13496:
[ticket/13496] Update calls to `set_config_count()`
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 1 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 3 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 3 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d41bb05180..bc8ea16338 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -115,7 +115,6 @@ request_var('', 0, false, false, $request); // "dependency injection" for a func // Grab global variables, re-cache if necessary /* @var $config \phpbb\config\config */ $config = $phpbb_container->get('config'); -set_config_count(null, null, null, $config); if (!isset($config['version_update_from'])) { diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index e636e772a7..9f6116ed12 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -150,7 +150,6 @@ class install_convert extends module // 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_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 @@ -390,7 +389,6 @@ class install_convert extends module // 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_count(null, null, null, $config); $convertor_tag = request_var('tag', ''); @@ -636,7 +634,6 @@ class install_convert extends module // 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_count(null, null, null, $config); // Override a couple of config variables for the duration $config['max_quote_depth'] = 0; diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index e5e0048f29..536b7142d5 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1493,7 +1493,6 @@ class install_install extends module // 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_count(null, null, null, $config); $error = false; $search = new \phpbb\search\fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); @@ -1909,7 +1908,6 @@ class install_install extends module // 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_count(null, null, null, $config); $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " @@ -1982,7 +1980,6 @@ class install_install extends module // 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_count(null, null, null, $config); $user->session_begin(); $auth->login($data['admin_name'], $data['admin_pass1'], false, true, true); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index d8b50c4aa3..cb00895a4b 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -115,7 +115,6 @@ class install_update extends module // 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_count(null, null, null, $config); // Force template recompile $config['load_tplcompile'] = 1; |