1 files changed, 13 insertions, 3 deletions
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index f3e46315b..fd9738826 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -4,23 +4,33 @@
  *
  * @package Elgg.Core
  * @subpackage Navigation
+ *
+ * @uses $vars['item']       ElggMenuItem
+ * @uses $vars['item_class'] Additional CSS class for the menu item
  */
 
 $item = $vars['item'];
 
 $link_class = 'elgg-menu-closed';
 if ($item->getSelected()) {
-	$item->setItemClass('elgg-state-selected');
+	// @todo switch to addItemClass when that is implemented
+	//$item->setItemClass('elgg-state-selected');
 	$link_class = 'elgg-menu-opened';
 }
 
 $children = $item->getChildren();
 if ($children) {
-	$item->setLinkClass($link_class);
-	$item->setLinkClass('elgg-menu-parent');
+	$item->addLinkClass($link_class);
+	$item->addLinkClass('elgg-menu-parent');
 }
 
 $item_class = $item->getItemClass();
+if ($item->getSelected()) {
+	$item_class = "$item_class elgg-state-selected";
+}
+if (isset($vars['item_class']) && $vars['item_class']) {
+	$item_class .= ' ' . $vars['item_class'];
+}
 
 echo "<li class=\"$item_class\">";
 echo $item->getContent();