aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/classes/ElggMenuItem.php6
-rwxr-xr-xmod/profile/views/default/profile/owner_block.php2
-rw-r--r--views/default/navigation/menu/elements/item.php2
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,