mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-18 14:31:19 +02:00
Code Issues Releases Wiki Activity

[ticket/13494] Update calls to set_config()

Browse Source 
PHPBB3-13494
This commit is contained in:
Gaëtan Muller
2015-01-11 17:32:31 +01:00
parent 6e2838a4ca
commit 79d4ff5538
45 changed files with 175 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/cache/driver/eaccelerator.php vendored
View File

@@ -44,9 +44,11 @@ class eaccelerator extends \phpbb\cache\driver\memory
*/
function tidy()
{
global $config;
eaccelerator_gc();
set_config('cache_last_gc', time(), true);
$config->set('cache_last_gc', time(), false);
}
/**

4
phpBB/phpbb/cache/driver/file.php vendored
View File

@@ -95,7 +95,7 @@ class file extends \phpbb\cache\driver\base
*/
function tidy()
{
global $phpEx;
global $config, $phpEx;
$dir = @opendir($this->cache_dir);
@@ -149,7 +149,7 @@ class file extends \phpbb\cache\driver\base
}
}
set_config('cache_last_gc', time(), true);
$config->set('cache_last_gc', time(), false);
}
/**

5
phpBB/phpbb/cache/driver/memory.php vendored
View File

@@ -81,9 +81,10 @@ abstract class memory extends \phpbb\cache\driver\base
*/
function tidy()
{
// cache has auto GC, no need to have any code here :)
global $config;
set_config('cache_last_gc', time(), true);
// cache has auto GC, no need to have any code here :)
$config->set('cache_last_gc', time(), false);
}
/**

4
phpBB/phpbb/cache/driver/null.php vendored
View File

@@ -52,8 +52,10 @@ class null extends \phpbb\cache\driver\base
*/
function tidy()
{
global $config;
// This cache always has a tidy room.
set_config('cache_last_gc', time(), true);
$config->set('cache_last_gc', time(), false);
}
/**

2
phpBB/phpbb/captcha/plugins/gd.php
View File

@@ -80,7 +80,7 @@ class gd extends captcha_abstract
$value = request_var($captcha_var, 0);
if ($value >= 0)
{
set_config($captcha_var, $value);
$config->set($captcha_var, $value);
}
}

2
phpBB/phpbb/captcha/plugins/recaptcha.php
View File

@@ -97,7 +97,7 @@ class recaptcha extends captcha_abstract
$value = request_var($captcha_var, '');
if ($value)
{
set_config($captcha_var, $value);
$config->set($captcha_var, $value);
}
}

4
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
View File

@@ -62,6 +62,8 @@ class style_update_p1 extends \phpbb\db\migration\migration
public function styles_update()
{
global $config;
// Get list of valid 3.1 styles
$available_styles = array('prosilver');
@@ -163,7 +165,7 @@ class style_update_p1 extends \phpbb\db\migration\migration
$default_style = $this->db->sql_fetchfield($result);
$this->db->sql_freeresult($result);
set_config('default_style', $default_style);
$config->set('default_style', $default_style);
$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
$this->sql_query($sql);

6
phpBB/phpbb/search/fulltext_mysql.php
View File

@@ -188,8 +188,8 @@ class fulltext_mysql extends \phpbb\search\base
}
$this->db->sql_freeresult($result);
set_config('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']);
set_config('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']);
$this->config->set('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']);
$this->config->set('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']);
return false;
}
@@ -745,7 +745,7 @@ class fulltext_mysql extends \phpbb\search\base
// destroy too old cached search results
$this->destroy_cache(array());
set_config('search_last_gc', time(), true);
$this->config->set('search_last_gc', time(), false);
}
/**

6
phpBB/phpbb/search/fulltext_native.php
View File

@@ -1425,7 +1425,7 @@ class fulltext_native extends \phpbb\search\base
// carry on ... it's okay ... I know when I'm not wanted boo hoo
if (!$this->config['fulltext_native_load_upd'])
{
set_config('search_last_gc', time(), true);
$this->config->set('search_last_gc', time(), false);
return;
}
@@ -1460,7 +1460,7 @@ class fulltext_native extends \phpbb\search\base
// by setting search_last_gc to the new time here we make sure that if a user reloads because the
// following query takes too long, he won't run into it again
set_config('search_last_gc', time(), true);
$this->config->set('search_last_gc', time(), false);
// Delete the matches
$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
@@ -1476,7 +1476,7 @@ class fulltext_native extends \phpbb\search\base
$this->destroy_cache(array_unique($destroy_cache_words));
}
set_config('search_last_gc', time(), true);
$this->config->set('search_last_gc', time(), false);
}
/**

2
phpBB/phpbb/search/fulltext_postgres.php
View File

@@ -746,7 +746,7 @@ class fulltext_postgres extends \phpbb\search\base
// destroy too old cached search results
$this->destroy_cache(array());
set_config('search_last_gc', time(), true);
$this->config->set('search_last_gc', time(), false);
}
/**

6
phpBB/phpbb/search/fulltext_sphinx.php
View File

@@ -140,7 +140,7 @@ class fulltext_sphinx
if(!$this->config['fulltext_sphinx_id'])
{
set_config('fulltext_sphinx_id', unique_id());
$this->config->set('fulltext_sphinx_id', unique_id());
}
$this->id = $this->config['fulltext_sphinx_id'];
$this->indexes = 'index_phpbb_' . $this->id . '_delta;index_phpbb_' . $this->id . '_main';
@@ -211,7 +211,7 @@ class fulltext_sphinx
}
// Move delta to main index each hour
set_config('search_gc', 3600);
$this->config->set('search_gc', 3600);
return false;
}
@@ -757,7 +757,7 @@ class fulltext_sphinx
*/
public function tidy($create = false)
{
set_config('search_last_gc', time(), true);
$this->config->set('search_last_gc', time(), false);
}
/**

6
phpBB/phpbb/session.php
View File

@@ -345,8 +345,8 @@ class session
}
else
{
set_config('limit_load', '0');
set_config('limit_search_load', '0');
$config->set('limit_load', '0');
$config->set('limit_search_load', '0');
}
}
@@ -1036,7 +1036,7 @@ class session
{
// Less than 10 users, update gc timer ... else we want gc
// called again to delete other sessions
set_config('session_last_gc', $this->time_now, true);
$config->set('session_last_gc', $this->time_now, false);
if ($config['max_autologin_time'])
{