From 6412a94c3c21ce163c68546e33bdeb9c8650e9f9 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 29 Dec 2010 13:36:33 +0000
Subject: page menu using the new menu system - admin menu updated

git-svn-id: http://code.elgg.org/elgg/trunk@7738 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggMenuBuilder.php |  2 +-
 engine/classes/ElggMenuItem.php    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'engine/classes')

diff --git a/engine/classes/ElggMenuBuilder.php b/engine/classes/ElggMenuBuilder.php
index 3528eaef8..f51ec8c62 100644
--- a/engine/classes/ElggMenuBuilder.php
+++ b/engine/classes/ElggMenuBuilder.php
@@ -32,7 +32,7 @@ class ElggMenuBuilder {
 
 		$this->selectFromContext();
 
-		$selected = $this->findSelected();
+		$this->selected = $this->findSelected();
 
 		$this->setupSections();
 
diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index 2205ebc89..40df8f182 100644
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -21,7 +21,7 @@ class ElggMenuItem {
 	/**
 	 * @var string The menu url
 	 */
-	protected $url;
+	protected $url = null;
 
 	/**
 	 * @var array Page context array
@@ -68,7 +68,9 @@ class ElggMenuItem {
 	public function __construct($name, $title, $url) {
 		$this->name = $name;
 		$this->title = $title;
-		$this->url = elgg_normalize_url($url);
+		if ($url) {
+			$this->url = elgg_normalize_url($url);
+		}
 	}
 
 	/**
@@ -82,7 +84,7 @@ class ElggMenuItem {
 	 * @return ElggMenuItem or NULL on error
 	 */
 	public static function factory($options) {
-		if (!isset($options['name']) || !isset($options['title']) || !isset($options['url'])) {
+		if (!isset($options['name']) || !isset($options['title'])) {
 			return NULL;
 		}
 
@@ -323,8 +325,10 @@ class ElggMenuItem {
 	 * @return string
 	 */
 	public function getLink(array $vars = array()) {
-		$vars['href'] = $this->url;
 		$vars['text'] = $this->title;
+		if ($this->url) {
+			$vars['href'] = $this->url;
+		}
 
 		return elgg_view('output/url', $vars);
 	}
-- 
cgit v1.2.3