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
---
 views/default/navigation/submenu_item.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'views/default/navigation/submenu_item.php')

diff --git a/views/default/navigation/submenu_item.php b/views/default/navigation/submenu_item.php
index c64f8a679..ff2cc48d1 100644
--- a/views/default/navigation/submenu_item.php
+++ b/views/default/navigation/submenu_item.php
@@ -13,7 +13,7 @@
 
 $group = (isset($vars['group'])) ? $vars['group'] : 'default';
 $item = (isset($vars['item'])) ? $vars['item'] : FALSE;
-$children_html = (isset($vars['children_html'])) ? $vars['children_html'] : FALSE;
+$children_html = (isset($vars['children_html'])) ? $vars['children_html'] : '';
 
 
 if ($item) {
@@ -34,8 +34,16 @@ if ($item) {
 		$child_indicator = "<span class=\"child_indicator\">$child_indicator </span>";
 	}
 
-	$url = htmlentities($item->url);
+	$url = htmlentities($item->href);
 	$text = $child_indicator . htmlentities($item->text);
+
+	$link_vars = array_merge($vars, array(
+		'href' => $item->href,
+		'text' => $text,
+		'encode_text' => FALSE
+	));
+
+	$link = elgg_view('output/url', $link_vars);
 }
-?>
-<li <?php echo $selected; ?>><a href="<?php echo $url; ?>" <?php echo $js; ?>><?php echo $text; ?></a><?php echo $children_html; ?></li>
+
+echo "<li $selected>$link$children_html</li>";
-- 
cgit v1.2.3