diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:02:53 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:02:53 +0100 |
| commit | 0682e5719d55a10485050dc1fc7561c32e6b3fb8 (patch) | |
| tree | 808fe81e37131b4414bd91abf8593c5adc82ad6c /phpBB/phpbb/avatar | |
| parent | b9c08cddd47b39355458e828d847c34ab0e8c378 (diff) | |
| parent | 679559ce180ec5210edb3a019e9ca862d7fddf4e (diff) | |
| download | forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar.gz forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar.bz2 forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar.xz forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
Diffstat (limited to 'phpBB/phpbb/avatar')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/local.php | 4 |
1 files changed, 2 insertions, 2 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); } } |