From b94f9ae3029777fa0aba2f3cb52b321925ce7e72 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Jan 2013 20:57:21 -0500
Subject: [ticket/11305] Retrieve cache driver from container rather than cache
 service.

This only covers some of the call sites.

PHPBB3-11305
---
 phpBB/includes/acp/acp_modules.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/acp/acp_modules.php')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 8528dc91c4..52a82004e8 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -740,15 +740,15 @@ class acp_modules
 	*/
 	function remove_cache_file()
 	{
-		global $cache;
+		global $phpbb_container;
 
 		// Sanitise for future path use, it's escaped as appropriate for queries
 		$p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class));
 
-		$cache->destroy('_modules_' . $p_class);
+		$phpbb_container->get('cache.driver')->destroy('_modules_' . $p_class);
 
 		// Additionally remove sql cache
-		$cache->destroy('sql', MODULES_TABLE);
+		$phpbb_container->get('cache.driver')->destroy('sql', MODULES_TABLE);
 	}
 
 	/**
-- 
cgit v1.2.1


From e483e3f4591b584aeea32aa5bb2a7be322086287 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 1 Mar 2013 12:05:08 -0600
Subject: [ticket/11363] Fix to make get_module_infos get from all extensions

Depends on 11381

PHPBB3-11363
---
 phpBB/includes/acp/acp_modules.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/acp/acp_modules.php')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 52a82004e8..fce26bf45f 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -535,8 +535,14 @@ class acp_modules
 
 	/**
 	* Get available module information from module files
+	*
+	* @param string $module
+	* @param bool|string $module_class
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
+	* @return array
 	*/
-	function get_module_infos($module = '', $module_class = false)
+	function get_module_infos($module = '', $module_class = false, $use_all_available = false)
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -556,7 +562,7 @@ class acp_modules
 				->extension_directory("/$module_class")
 				->core_path("includes/$module_class/info/")
 				->core_prefix($module_class . '_')
-				->get_classes();
+				->get_classes(true, $use_all_available);
 
 			foreach ($modules as $module)
 			{
-- 
cgit v1.2.1