From ca2d3d64b45e5e69843a090e5e7da3b3ac19f3ac Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 24 Feb 2011 01:49:52 +0000
Subject: using getContent() in menu system in preparation for supporting
 non-links

git-svn-id: http://code.elgg.org/elgg/trunk@8457 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggMenuItem.php                   | 6 +++---
 mod/profile/views/default/profile/owner_block.php | 2 +-
 views/default/navigation/menu/elements/item.php   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index 8bff0abba..58c26aa22 100644
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -401,13 +401,13 @@ class ElggMenuItem {
 	}
 
 	/**
-	 * Get the menu link
+	 * Get the menu item content (usually a link)
 	 *
-	 * @params array $vars Options to pass to output/url
+	 * @params array $vars Options to pass to output/url if a link
 	 *
 	 * @return string
 	 */
-	public function getLink(array $vars = array()) {
+	public function getContent(array $vars = array()) {
 		$vars['text'] = $this->text;
 		if ($this->href) {
 			$vars['href'] = $this->href;
diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index d257f03a8..20555d260 100755
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -28,7 +28,7 @@ $profile_actions = '';
 if (elgg_is_logged_in() && $actions) {
 	$profile_actions = '<ul class="elgg-menu">';
 	foreach ($actions as $action) {
-		$profile_actions .= '<li>' . $action->getLink(array('class' => 'elgg-button elgg-button-action')) . '</li>';
+		$profile_actions .= '<li>' . $action->getContent(array('class' => 'elgg-button elgg-button-action')) . '</li>';
 	}
 	$profile_actions .= '</ul>';
 }
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 7b07c9485..d1d721c63 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -26,7 +26,7 @@ if ($item_class) {
 }
 
 echo "<li $class>";
-echo $item->getLink($link_vars);
+echo $item->getContent($link_vars);
 if ($children) {
 	echo elgg_view('navigation/menu/elements/group', array(
 		'items' => $children,
-- 
cgit v1.2.3