7 files changed, 14 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index 36cb33b816..1fc90bf06d 100755
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -53,6 +53,7 @@ class mcp_logs
 		$sort_dir	= request_var('sd', 'd');
 
 		$this->tpl_name = 'mcp_logs';
+		$this->page_title = 'MCP_LOGS';
 
 		$forum_id = $topic_id = 0;
 		switch ($mode)
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 60ff2cf9d3..3f54a1edec 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -135,6 +135,7 @@ class mcp_main
 				mcp_front_view($id, $mode, $action);
 
 				$this->tpl_name = 'mcp_front';
+				$this->page_title = 'MCP_MAIN';
 			break;
 
 			case 'forum_view':
@@ -157,6 +158,7 @@ class mcp_main
 				mcp_forum_view($id, $mode, $action, $forum_info);
 
 				$this->tpl_name = 'mcp_forum';
+				$this->page_title = 'MCP_MAIN_FORUM_VIEW';
 			break;
 
 			case 'topic_view':
@@ -165,6 +167,7 @@ class mcp_main
 				mcp_topic_view($id, $mode, $action);
 
 				$this->tpl_name = 'mcp_topic';
+				$this->page_title = 'MCP_MAIN_TOPIC_VIEW';
 			break;
 
 			case 'post_details':
@@ -180,6 +183,7 @@ class mcp_main
 				{
 					$this->tpl_name = 'mcp_post';
 				}
+				$this->page_title = 'MCP_MAIN_POST_DETAILS';
 			break;
 
 			default:
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 4544f3cfd3..4c61071ce7 100755
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -35,6 +35,8 @@ class mcp_notes
 			list($action, ) = each($action);
 		}
 
+		$this->page_title = 'MCP_NOTES';
+
 		switch ($mode)
 		{
 			case 'front':
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 94f6ffe35a..1a3fc4b273 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -33,6 +33,8 @@ class mcp_queue
 		$forum_id = request_var('f', 0);
 		$start = request_var('start', 0);
 
+		$this->page_title = 'MCP_QUEUE';
+
 		switch ($action)
 		{
 			case 'approve':
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 9c5311b72d..21489ae95e 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -33,6 +33,8 @@ class mcp_reports
 		$forum_id = request_var('f', 0);
 		$start = request_var('start', 0);
 
+		$this->page_title = 'MCP_REPORTS';
+
 		switch ($action)
 		{
 			case 'close':
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 4ea2e04d99..26eeb89bd6 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -35,6 +35,8 @@ class mcp_warn
 			list($action, ) = each($action);
 		}
 
+		$this->page_title = 'MCP_WARN';
+
 		switch ($mode)
 		{
 			case 'front':
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index e6520797a1..d8450a4470 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -214,13 +214,8 @@ $module->load_active();
 $module->assign_tpl_vars("mcp.$phpEx$SID");
 
 // Generate the page
-page_header($user->lang['MCP_MAIN']);
+$module->display($module->get_page_title());
 
-$template->set_filenames(array(
-	'body' => $module->get_tpl_name())
-);
-
-page_footer();
 
 /**
 * Functions used to generate additional URL paramters