From 37446557462b35b5c6690f7f8f739c4dd861b85b Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 10 May 2010 16:00:52 +0000
Subject: Admin area now uses standard submenu tools.

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

(limited to 'engine/lib/elgglib.php')

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 1c0d1cfc1..8d41de1cc 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -910,7 +910,7 @@ function add_submenu_item($label, $link, $group = 'default', $onclick = false, $
 
 	$item = array(
 		'text' => $label,
-		'url' => $link,
+		'href' => $link,
 		'selected' => $selected
 	);
 
@@ -1003,7 +1003,7 @@ function elgg_add_submenu_item(array $item, $context = 'all', $group = 'default'
  * @param bool $sort Sort the menu items alphabetically
  * @since 1.8
  */
-function elgg_prepare_submenu($context = 'main', $sort = TRUE) {
+function elgg_prepare_submenu($context = 'main', $sort = FALSE) {
 	global $CONFIG;
 
 	if (!isset($CONFIG->submenu_items) || !($CONFIG->submenu_items)) {
@@ -1052,9 +1052,9 @@ function elgg_prepare_submenu($context = 'main', $sort = TRUE) {
 				}
 
 				// if the parent doesn't have a url, make it the first child item.
-				if (isset($item->children) && $item->children && !$item->url) {
+				if (isset($item->children) && $item->children && !$item->href) {
 					$child = $item->children[0];
-					while ($child && !isset($child->url)) {
+					while ($child && !isset($child->href)) {
 						if (isset($child->children) && isset($child->children[0])) {
 							$child = $child->children[0];
 						} else {
@@ -1062,11 +1062,11 @@ function elgg_prepare_submenu($context = 'main', $sort = TRUE) {
 						}
 					}
 
-					if ($child && isset($child->url)) {
-						$item->url = $child->url;
+					if ($child && isset($child->href)) {
+						$item->href = $child->href;
 					} else {
 						// @todo There are no URLs anywhere in this tree.
-						$item->url = $CONFIG->url;
+						$item->href = $CONFIG->url;
 					}
 				}
 			}
@@ -1139,14 +1139,14 @@ function elgg_get_submenu($context = NULL, $sort = FALSE) {
 		while ($item = current($items)) {
 			$t = '';
 			// ignore parents created by a child but parent never defined properly
-			if (!isset($item->text) || !isset($item->url) || !($item->text) || !($item->url)) {
+			if (!isset($item->text) || !isset($item->href) || !($item->text) || !($item->href)) {
 				next($items);
 				continue;
 			}
 
 			// try to guess if this should be selected if they don't specify
-			if ((!isset($item->selected) || $item->selected === NULL) && isset($item->url)) {
-				$item->selected = elgg_http_url_is_identical($_SERVER['REQUEST_URI'], $item->url);
+			if ((!isset($item->selected) || $item->selected === NULL) && isset($item->href)) {
+				$item->selected = elgg_http_url_is_identical($_SERVER['REQUEST_URI'], $item->href);
 			}
 
 			// traverse up the parent tree if matached to mark all parents as selected/expanded.
-- 
cgit v1.2.3