2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 82c4d6e8c5..f00c1a7fb4 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -118,7 +118,7 @@ class acp_ban
 	/**
 	* Display ban options
 	*/
-	function display_ban_options($mode)
+	static function display_ban_options($mode)
 	{
 		global $user, $db, $template;
 
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 0ab8ac6f6b..d2b9bb08bb 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -34,6 +34,12 @@ class acp_modules
 	var $module_class = '';
 	var $parent_id;
 	var $u_action;
+	var $p_master;
+
+	function __construct(p_master $p_master)
+	{
+		$this->p_master = $p_master;
+	}
 
 	function main($id, $mode)
 	{
@@ -624,7 +630,7 @@ class acp_modules
 			if (!$ignore_acl && $row['module_auth'])
 			{
 				// We use zero as the forum id to check - global setting.
-				if (!p_master::module_auth($row['module_auth'], 0))
+				if (!$this->p_master->module_auth($row['module_auth'], 0))
 				{
 					continue;
 				}