From cb08bf3c0cac1f15ae46238a00a56ff7bf72efda Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Jan 2013 21:46:43 +0100
Subject: [PATCH] [feature/avatars] Strictly check if avatar list is empty and
 cache result

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index f82c9a6c74..b96b602f85 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -142,6 +142,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 	/**
 	* Get a list of avatars that are locally available
+	* Results get cached for 24 hours (86400 seconds)
 	*
 	* @return array Array containing the locally available avatars
 	*/
@@ -149,7 +150,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	{
 		$avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list');
 
-		if (!$avatar_list)
+		if ($avatar_list === false)
 		{
 			$avatar_list = array();
 			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
@@ -185,7 +186,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 			if ($this->cache != null)
 			{
-				$this->cache->put('avatar_local_list', $avatar_list);
+				$this->cache->put('avatar_local_list', $avatar_list, 86400);
 			}
 		}