Merge branch '3.2.x'

* 3.2.x: [ticket/15620] Use separate local avatar cache file for every lang
fededj · Jul 8, 2018 · 001604d · 001604d
2 parents 683250e + bdd384a
commit 001604d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
@@ -158,7 +158,7 @@ public function get_template_name()
 	*/
 	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_' . $user->data['user_lang']);
 
 		if ($avatar_list === false)
 		{
@@ -198,7 +198,7 @@ protected function get_avatar_list($user)
 
 			if ($this->cache != null)
 			{
-				$this->cache->put('_avatar_local_list', $avatar_list, 86400);
+				$this->cache->put('_avatar_local_list_' . $user->data['user_lang'], $avatar_list, 86400);
 			}
 		}