4 files changed, 31 insertions, 27 deletions
diff --git a/phpBB/includes/functions_mcp.php b/phpBB/includes/functions_mcp.php
index 1c38d227f4..a3eb4102d8 100644
--- a/phpBB/includes/functions_mcp.php
+++ b/phpBB/includes/functions_mcp.php
@@ -22,12 +22,12 @@ if (!defined('IN_PHPBB'))
 /**
 * Functions used to generate additional URL paramters
 */
-function _module__url($mode, &$module_row)
+function phpbb_module__url($mode, &$module_row)
 {
-	return extra_url();
+	return phpbb_extra_url();
 }
 
-function _module_notes_url($mode, &$module_row)
+function phpbb_module_notes_url($mode, &$module_row)
 {
 	if ($mode == 'front')
 	{
@@ -38,7 +38,7 @@ function _module_notes_url($mode, &$module_row)
 	return ($user_id) ? "&amp;u=$user_id" : '';
 }
 
-function _module_warn_url($mode, &$module_row)
+function phpbb_module_warn_url($mode, &$module_row)
 {
 	if ($mode == 'front' || $mode == 'list')
 	{
@@ -64,32 +64,32 @@ function _module_warn_url($mode, &$module_row)
 	}
 }
 
-function _module_main_url($mode, &$module_row)
+function phpbb_module_main_url($mode, &$module_row)
 {
-	return extra_url();
+	return phpbb_extra_url();
 }
 
-function _module_logs_url($mode, &$module_row)
+function phpbb_module_logs_url($mode, &$module_row)
 {
-	return extra_url();
+	return phpbb_extra_url();
 }
 
-function _module_ban_url($mode, &$module_row)
+function phpbb_module_ban_url($mode, &$module_row)
 {
-	return extra_url();
+	return phpbb_extra_url();
 }
 
-function _module_queue_url($mode, &$module_row)
+function phpbb_module_queue_url($mode, &$module_row)
 {
-	return extra_url();
+	return phpbb_extra_url();
 }
 
-function _module_reports_url($mode, &$module_row)
+function phpbb_module_reports_url($mode, &$module_row)
 {
-	return extra_url();
+	return phpbb_extra_url();
 }
 
-function extra_url()
+function phpbb_extra_url()
 {
 	global $forum_id, $topic_id, $post_id, $report_id, $user_id;
 
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 41c6f0118e..86439ea03f 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -250,13 +250,25 @@ class p_master
 			// Function for building 'url_extra'
 			$short_name = $this->get_short_name($row['module_basename']);
 
-			$url_func = '_module_' . $short_name . '_url';
+			$url_func = 'phpbb_module_' . $short_name . '_url';
+			if (!function_exists($url_func))
+			{
+				$url_func = '_module_' . $short_name . '_url';
+			}
 
 			// Function for building the language name
-			$lang_func = '_module_' . $short_name . '_lang';
+			$lang_func = 'phpbb_module_' . $short_name . '_lang';
+			if (!function_exists($lang_func))
+			{
+				$lang_func = '_module_' . $short_name . '_lang';
+			}
 
 			// Custom function for calling parameters on module init (for example assigning template variables)
 			$custom_func = 'phpbb_module_' . $short_name;
+			if (!function_exists($custom_func))
+			{
+				$custom_func = '_module_' . $short_name;
+			}
 
 			$names[$row['module_basename'] . '_' . $row['module_mode']][] = true;
 
@@ -286,14 +298,6 @@ class p_master
 			{
 				$custom_func($row['module_mode'], $module_row);
 			}
-			else
-			{
-				$custom_func = '_module_' . $short_name;
-				if (function_exists($custom_func))
-				{
-					$custom_func($row['module_mode'], $module_row);
-				}
-			}
 
 			/**
 			* This event allows to modify parameters for building modules list
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index d2cc5d285e..a490f8a677 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -43,7 +43,7 @@ function mcp_post_details($id, $mode, $action)
 	}
 
 	$post_info = $post_info[$post_id];
-	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url());
+	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . phpbb_extra_url());
 
 	switch ($action)
 	{
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index f8ce8aae7b..b603bfc049 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -27,7 +27,7 @@ function mcp_topic_view($id, $mode, $action)
 	global $phpEx, $phpbb_root_path, $config;
 	global $template, $db, $user, $auth, $cache, $phpbb_container;
 
-	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url());
+	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . phpbb_extra_url());
 
 	$user->add_lang('viewtopic');
 	$pagination = $phpbb_container->get('pagination');