From df3b9d6db9b2539222b9e1d2a467d9707a0846c7 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 12 Nov 2010 21:27:40 +0000
Subject: [PATCH] Fixed a bug where the user menu overwrites the link to the
 MCP with the link to the front page although a different link might be
 wanted, i.e. on different pages of the forum when using the Portalview MOD

---
 root/portal/modules/portal_user_menu.php                      | 2 +-
 .../prosilver/template/portal/modules/user_menu_side.html     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/root/portal/modules/portal_user_menu.php b/root/portal/modules/portal_user_menu.php
index c1feb7df..76882ad5 100644
--- a/root/portal/modules/portal_user_menu.php
+++ b/root/portal/modules/portal_user_menu.php
@@ -124,7 +124,7 @@ class portal_user_menu_module
 				'U_UNREAD_POSTS'		=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'),
 				'U_UM_BOOKMARKS'		=> ($config['allow_bookmarks']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=main&amp;mode=bookmarks') : '',
 				'U_UM_MAIN_SUBSCRIBED'	=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=main&amp;mode=subscribed'),
-				'U_MCP'					=> ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=front', true, $user->session_id) : '',
+				'U_UM_MCP'				=> ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=front', true, $user->session_id) : '',
 				'S_DISPLAY_SUBSCRIPTIONS' => ($config['allow_topic_notify'] || $config['allow_forum_notify']) ? true : false,
 			));
 
diff --git a/root/styles/prosilver/template/portal/modules/user_menu_side.html b/root/styles/prosilver/template/portal/modules/user_menu_side.html
index b2c32bdd..349bd8ec 100644
--- a/root/styles/prosilver/template/portal/modules/user_menu_side.html
+++ b/root/styles/prosilver/template/portal/modules/user_menu_side.html
@@ -29,8 +29,8 @@
 					<li><a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a></li>
 				<!-- ENDIF -->
 				<li><a href="{U_PROFILE}">{L_PROFILE}</a></li>
-				<!-- IF U_MCP -->
-					<li><a href="{U_MCP}">{L_MCP}</a></li>
+				<!-- IF U_UM_MCP -->
+					<li><a href="{U_UM_MCP}">{L_MCP}</a></li>
 				<!-- ENDIF -->
 				<!-- IF U_ACP -->
 					<li><a href="{U_ACP}">{L_M_ACP}</a></li>