aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-06-13 01:46:50 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-06-13 01:46:50 +0000
commita420910a8b782bae53fbd7f86102db9f9b831388 (patch)
treebb9112be62f330dbcbbcdea6de6c891fe9f6742a
parentd5a957f871c9d0f82732d77b2ca425ed37a57ecc (diff)
downloadelgg-a420910a8b782bae53fbd7f86102db9f9b831388.tar.gz
elgg-a420910a8b782bae53fbd7f86102db9f9b831388.tar.bz2
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
-rw-r--r--engine/classes/ElggMenuItem.php11
-rw-r--r--views/default/navigation/menu/elements/item.php8
2 files changed, 11 insertions, 8 deletions
diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index caaba49a1..157ed9ceb 100644
--- 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 55ddc2fe4..f3e46315b 100644
--- 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(