! The mention menu was not showing as active when selected

Signed-off-by: Spuds <spuds@spudsdesign.com>

sources/Subs.php

@@ -3531,16 +3531,15 @@ function setupMenuContext()
 						'href' => $scripturl . '?action=profile;area=theme',
 						'show' => allowedTo(array('profile_extra_any', 'profile_extra_own', 'profile_extra_any')),
 					),
-					// The old "logout" is meh. Not a real word. "Log out" is better.
 					'logout' => array(
 						'title' => $txt['logout'],
 						'href' => $scripturl . '?action=logout',
 						'show' => !$user_info['is_guest'],
 					),
 				),
 			),
-			// @todo - Will look at doing something here, to provide instant access to inbox when using click menus.
-			// @todo - A small pop-up anchor seems like the obvious way to handle it. ;)
+			// @todo Look at doing something here, to provide instant access to inbox when using click menus.
+			// @todo A small pop-up anchor seems like the obvious way to handle it. ;)
 			'pm' => array(
 				'title' => $txt['pm_short'],
 				'counter' => 'unread_messages',
@@ -3560,15 +3559,13 @@ function setupMenuContext()
 					),
 				),
 			),
-
-			'mention' => array(
+			'mentions' => array(
 				'title' => $txt['mention'],
 				'counter' => 'mentions',
 				'href' => $scripturl . '?action=mentions',
 				'data-icon' => '',
 				'show' => !$user_info['is_guest'] && !empty($modSettings['mentions_enabled']),
 			),
-
 			// The old language string made no sense, and was too long.
 			// "New posts" is better, because there are probably a pile
 			// of old unread posts, and they wont be reached from this button.
@@ -3578,7 +3575,6 @@ function setupMenuContext()
 				'data-icon' => '',
 				'show' => !$user_info['is_guest'],
 			),
-
 			// The old language string made no sense, and was too long.
 			// "New replies" is better, because there are "updated topics"
 			// that the user has never posted in and doesn't care about.
@@ -3588,9 +3584,6 @@ function setupMenuContext()
 				'data-icon' => '',
 				'show' => !$user_info['is_guest'],
 			),
-
-			// "Log out" would be better here.
-			// "Login" is not a word, and sort of runs together into a bleh.
 			'login' => array(
 				'title' => $txt['login'],
 				'href' => $scripturl . '?action=login',
@@ -3691,8 +3684,6 @@ function setupMenuContext()
 
 	if (isset($context['menu_buttons'][$context['current_action']]))
 		$current_action = $context['current_action'];
-// 	elseif ($context['current_action'] == 'search2')
-// 		$current_action = 'search';
 	elseif ($context['current_action'] == 'profile')
 		$current_action = 'pm';
 	elseif ($context['current_action'] == 'theme')