2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index b3cdbd6ab9..d25823ca43 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -283,6 +283,11 @@ class phpbb_extension_finder
 
 		if ($cache && $this->cache)
 		{
+			if ($this->cached_queries === false)
+			{
+				$this->cached_queries = array();
+			}
+
 			$this->cached_queries[$query] = $files;
 			$this->cache->put('_extension_finder', $this->cached_queries);
 		}
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index a1863040d0..e1e7571573 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -45,7 +45,9 @@ class phpbb_extension_manager
 		$this->phpEx = $phpEx;
 		$this->extension_table = $extension_table;
 
-		if (false === ($this->extensions = $this->cache->get('_extensions')))
+		$this->extensions = $this->cache->get('_extensions');
+
+		if ($this->extensions === false)
 		{
 			$this->load_extensions();
 		}