From b55d0098a07875d4b716c572cede1de9800c7097 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 8 May 2010 03:54:25 +0000
Subject: Not setting $item->selected on a submenu item acts the same as
 setting it to NULL for selected state guessing. Removed unused code in
 submenu system.

git-svn-id: http://code.elgg.org/elgg/trunk@5983 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 16ace68be..1c0d1cfc1 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1130,9 +1130,6 @@ function elgg_get_submenu($context = NULL, $sort = FALSE) {
 	$groups = $CONFIG->submenu[$context];
 	$submenu_html = '';
 
-	// the guessed selected item.
-	$auto_selected = NULL;
-
 	foreach ($groups as $group => $items) {
 		// how far down we are in children arrays
 		$depth = 0;
@@ -1148,7 +1145,7 @@ function elgg_get_submenu($context = NULL, $sort = FALSE) {
 			}
 
 			// try to guess if this should be selected if they don't specify
-			if ($item->selected === NULL && isset($item->url)) {
+			if ((!isset($item->selected) || $item->selected === NULL) && isset($item->url)) {
 				$item->selected = elgg_http_url_is_identical($_SERVER['REQUEST_URI'], $item->url);
 			}
 
@@ -1165,15 +1162,6 @@ function elgg_get_submenu($context = NULL, $sort = FALSE) {
 				}
 			}
 
-			$item->depth = $depth;
-//
-//			for ($i=0; $i<$depth; $i++) {
-//				$t .= " - ";
-//			}
-//
-//			var_dump("$t{$item->text} -> {$item->url} {$item->selected}");
-
-
 			// get the next item
 			if (isset($item->children) && $item->children) {
 				$depth++;
-- 
cgit v1.2.3