2 files changed, 32 insertions, 2 deletions
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index e5e5e4983e..23b9f1c658 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -375,6 +375,10 @@ class phpbb_extension_finder
 			{
 				$directory_pattern = preg_quote(DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#');
 			}
+			if ($is_dir)
+			{
+				$directory_pattern .= '$';
+			}
 			$directory_pattern = '#' . $directory_pattern . '#';
 
 			$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 438578e7e7..c38f0df32e 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -61,7 +61,7 @@ class phpbb_extension_manager
 	*
 	* @return null
 	*/
-	protected function load_extensions()
+	public function load_extensions()
 	{
 		$sql = 'SELECT *
 			FROM ' . $this->extension_table;
@@ -167,6 +167,11 @@ class phpbb_extension_manager
 			$this->db->sql_query($sql);
 		}
 
+		if ($this->cache)
+		{
+			$this->cache->destroy($this->cache_name);
+		}
+
 		return !$active;
 	}
 
@@ -219,6 +224,11 @@ class phpbb_extension_manager
 				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 			$this->db->sql_query($sql);
 
+			if ($this->cache)
+			{
+				$this->cache->destroy($this->cache_name);
+			}
+
 			return true;
 		}
 
@@ -234,6 +244,11 @@ class phpbb_extension_manager
 			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 		$this->db->sql_query($sql);
 
+		if ($this->cache)
+		{
+			$this->cache->destroy($this->cache_name);
+		}
+
 		return false;
 	}
 
@@ -292,6 +307,11 @@ class phpbb_extension_manager
 				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 			$this->db->sql_query($sql);
 
+			if ($this->cache)
+			{
+				$this->cache->destroy($this->cache_name);
+			}
+
 			return true;
 		}
 
@@ -301,6 +321,11 @@ class phpbb_extension_manager
 			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 		$this->db->sql_query($sql);
 
+		if ($this->cache)
+		{
+			$this->cache->destroy($this->cache_name);
+		}
+
 		return false;
 	}
 
@@ -329,7 +354,8 @@ class phpbb_extension_manager
 		$available = array();
 
 		$iterator = new RecursiveIteratorIterator(
-			new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'));
+			new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'),
+			RecursiveIteratorIterator::SELF_FIRST);
 		foreach ($iterator as $file_info)
 		{
 			if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->phpEx)