From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 31 May 2013 21:39:15 +0000 (-0400)
Subject: Fixes #4912 custom site menu items are now matched
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8d1e8f8c4cbb3e269d36c9867884eef2490dfc60;p=lorea%2Felgg.git

Fixes #4912 custom site menu items are now matched
---

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 118a7214c..2831d418b 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -323,7 +323,8 @@ function elgg_site_menu_setup($hook, $type, $return, $params) {
 	}
 	
 	if (!$selected) {
-		// nothing selected, match name to context
+		// nothing selected, match name to context or match url
+		$current_url = current_page_url();
 		foreach ($return as $section_name => $section) {
 			foreach ($section as $key => $item) {
 				// only highlight internal links
@@ -332,6 +333,10 @@ function elgg_site_menu_setup($hook, $type, $return, $params) {
 						$return[$section_name][$key]->setSelected(true);
 						break 2;
 					}
+					if ($item->getHref() == $current_url) {
+						$return[$section_name][$key]->setSelected(true);
+						break 2;
+					}
 				}
 			}
 		}