Fixes #3282 always using a menu item's name in its class

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

diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index caaba49a1a000b5a04ae3a6eaee4656381968969..157ed9ceb503098a6e6e4b206dc0f2991b9dd3c1 100644 (file)
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -325,7 +325,16 @@ class ElggMenuItem {
         * @return string
         */
        public function getItemClass() {
-               return implode(' ', $this->itemClass);
+               //allow people to specify name with underscores and colons
+               $name = str_replace('_', '-', $this->getName());
+               $name = str_replace(':', '-', $name);
+
+               $class = implode(' ', $this->itemClass);
+               if ($class) {
+                       return "elgg-menu-item-$name $class";
+               } else {
+                       return "elgg-menu-item-$name";
+               }
        }
 
        /**

diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 55ddc2fe4d76e8c00be5d1b14b1cc86af203de27..f3e46315b2a09dd3544740da93129c9c7f1ada06 100644 (file)
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -22,13 +22,7 @@ if ($children) {
 
 $item_class = $item->getItemClass();
 
-//allow people to specify name with underscores
-$name = str_replace('_', '-', $item->getName());
-if ($item_class) {
-       $class = "class=\"elgg-menu-item-$name $item_class\"";
-}
-
-echo "<li $class>";
+echo "<li class=\"$item_class\">";
 echo $item->getContent();
 if ($children) {
        echo elgg_view('navigation/menu/elements/section', array(