From ffde8c8e06c4d37bef5cde280d520c0791ed2c67 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 6 Jan 2012 17:20:41 +0100
Subject: [PATCH] [ticket/10477] Normalize loaded module names to be class
 names or xcp_ prefixed

PHPBB3-10477
---
 phpBB/includes/functions_module.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index d810285313..a6015b1eac 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -804,6 +804,13 @@ class p_master
 	*/
 	function load($class, $name, $mode = false)
 	{
+		// new modules use the full class names, old ones are always called <class>_<name>, e.g. acp_board
+		// in the latter case this function may be called as load(acp, board)
+		if (!class_exists($name) && substr($name, 0, strlen($class) + 1) !== $class . '_')
+		{
+			$name = $class . '_' . $name;
+		}
+
 		$this->p_class = $class;
 		$this->p_name = $name;