aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/avatar/driver
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-28 10:02:33 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-10-28 10:02:33 +0100
commit679559ce180ec5210edb3a019e9ca862d7fddf4e (patch)
tree4b73cd09425a14a8518d85e8697345ce367870c6 /phpBB/phpbb/avatar/driver
parentefe3aaaf0b9b2f60da89df0e285dace91f24cea1 (diff)
parent2e814cc43fe8194e496c743f576b55feadbc3812 (diff)
downloadforums-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/avatar/driver')
-rw-r--r--phpBB/phpbb/avatar/driver/local.php4
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);
}
}