Fixes #3287 added documentation on non-link menu items

git-svn-id: http://code.elgg.org/elgg/trunk@8893 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index 0538ed64c9323190746e58a08842f64aeb3cc0c2..3d512a08c6c955dc6d6dedfbd379825708a1d382 100644 (file)
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -5,6 +5,8 @@
  * @package    Elgg.Core
  * @subpackage Navigation
  *
+ * To create a menu item that is not a link, pass false for $href.
+ *
  * @since 1.8.0
  */
 class ElggMenuItem {
@@ -443,7 +445,7 @@ class ElggMenuItem {
         */
        public function getContent(array $vars = array()) {
 
-               if ($this->href === false) {
+               if ($this->href === false || $this->href === null) {
                        return $this->text;
                }
 

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 91d0704eb6bc18d5fa82745fa450ec8647f42bbc..8c8212a12d8eb7039ae86161f963914be51a1778 100644 (file)
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -61,7 +61,7 @@
  * @param mixed  $menu_item A ElggMenuItem object or an array of options in format:
  *                          name        => STR  Menu item identifier (required)
  *                          text        => STR  Menu item display text (required)
- *                          href        => STR  Menu item URL (required)
+ *                          href        => STR  Menu item URL (required) (false for non-links)
  *                          contexts    => ARR  Page context strings
  *                          section     => STR  Menu section identifier
  *                          title       => STR  Menu item tooltip