diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-02 20:07:46 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-02 20:07:46 +0100 |
| commit | df77174a2b2a8f9e86ee8f992556dd4820484be3 (patch) | |
| tree | 3a83dabddd37c465de62e60bd2bcecf3c8a29474 /phpBB/phpbb/cache | |
| parent | 6e2838a4cabc6e7874ff1a72af2d3eb4f5361428 (diff) | |
| parent | 79d4ff553844fa80be4da9286239f62a45489072 (diff) | |
| download | forums-df77174a2b2a8f9e86ee8f992556dd4820484be3.tar forums-df77174a2b2a8f9e86ee8f992556dd4820484be3.tar.gz forums-df77174a2b2a8f9e86ee8f992556dd4820484be3.tar.bz2 forums-df77174a2b2a8f9e86ee8f992556dd4820484be3.tar.xz forums-df77174a2b2a8f9e86ee8f992556dd4820484be3.zip | |
Merge pull request #3280 from MGaetan89/ticket/13494
[ticket/13494] Change set_config() calls with $config->set()
* MGaetan89/ticket/13494:
[ticket/13494] Update calls to `set_config()`
Diffstat (limited to 'phpBB/phpbb/cache')
| -rw-r--r-- | phpBB/phpbb/cache/driver/eaccelerator.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/cache/driver/file.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/cache/driver/memory.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/cache/driver/null.php | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/phpBB/phpbb/cache/driver/eaccelerator.php b/phpBB/phpbb/cache/driver/eaccelerator.php index 1697758acc..740855144f 100644 --- a/phpBB/phpbb/cache/driver/eaccelerator.php +++ b/phpBB/phpbb/cache/driver/eaccelerator.php @@ -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); } /** diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index 114959c06c..9c63d0010c 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -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); } /** diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index 0cef9c3483..baae22d809 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -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); } /** diff --git a/phpBB/phpbb/cache/driver/null.php b/phpBB/phpbb/cache/driver/null.php index a45cf97862..298731ea54 100644 --- a/phpBB/phpbb/cache/driver/null.php +++ b/phpBB/phpbb/cache/driver/null.php @@ -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); } /** |