Fixes #4502 selected menu items maintain plugin provided classes

diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 22383ce0be28ce17c63aed416e902c49a6ec7363..fd97388268e57338f4d3d319e29a9d73bef94e6d 100644 (file)
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -13,7 +13,8 @@ $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';
 }
 
@@ -24,6 +25,9 @@ if ($children) {
 }
 
 $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'];
 }