diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:02:33 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:02:33 +0100 |
| commit | 679559ce180ec5210edb3a019e9ca862d7fddf4e (patch) | |
| tree | 4b73cd09425a14a8518d85e8697345ce367870c6 /phpBB/phpbb | |
| parent | efe3aaaf0b9b2f60da89df0e285dace91f24cea1 (diff) | |
| parent | 2e814cc43fe8194e496c743f576b55feadbc3812 (diff) | |
| download | forums-679559ce180ec5210edb3a019e9ca862d7fddf4e.tar forums-679559ce180ec5210edb3a019e9ca862d7fddf4e.tar.gz forums-679559ce180ec5210edb3a019e9ca862d7fddf4e.tar.bz2 forums-679559ce180ec5210edb3a019e9ca862d7fddf4e.tar.xz forums-679559ce180ec5210edb3a019e9ca862d7fddf4e.zip | |
Merge branch 'naderman-ticket/13232' into prep-release-3.1.0
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/local.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/cron/manager.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php index 07b3ed59de..8888686b2d 100644 --- a/phpBB/phpbb/avatar/driver/local.php +++ b/phpBB/phpbb/avatar/driver/local.php @@ -154,7 +154,7 @@ class local extends \phpbb\avatar\driver\driver */ protected function get_avatar_list($user) { - $avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list'); + $avatar_list = ($this->cache == null) ? false : $this->cache->get('_avatar_local_list'); if ($avatar_list === false) { @@ -192,7 +192,7 @@ class local extends \phpbb\avatar\driver\driver if ($this->cache != null) { - $this->cache->put('avatar_local_list', $avatar_list, 86400); + $this->cache->put('_avatar_local_list', $avatar_list, 86400); } } diff --git a/phpBB/phpbb/cron/manager.php b/phpBB/phpbb/cron/manager.php index 5c8ac04b77..079ce8107e 100644 --- a/phpBB/phpbb/cron/manager.php +++ b/phpBB/phpbb/cron/manager.php @@ -73,6 +73,7 @@ class manager */ public function find_one_ready_task() { + shuffle($this->tasks); foreach ($this->tasks as $task) { if ($task->is_ready()) diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 968a57428f..96386f6d04 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -239,7 +239,7 @@ class version_helper */ public function get_versions($force_update = false, $force_cache = false) { - $cache_file = 'versioncheck_' . $this->host . $this->path . $this->file; + $cache_file = '_versioncheck_' . $this->host . $this->path . $this->file; $info = $this->cache->get($cache_file); |