Add current class to selected menu items

diff --git a/lib/action.php b/lib/action.php
index 920bbf31b9f32cec8fab23986b35fc2ceaf3b854..21e5f78db13567c0e406c922ca77382c2e62d54b 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -1351,14 +1351,17 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Added @id to li for some control.
         // XXX: We might want to move this to htmloutputter.php
-        $lattrs = array();
+        $lattrs  = array();
+        $classes = array();
         if ($class !== null) {
-            $lattrs['class'] = $class;
-            if ($is_selected) {
-                $lattrs['class'] = trim('current ' . $lattrs['class']);
-            }
+            $classes[] = trim($class);
+        }
+        if ($is_selected) {
+            $classes[] = 'current';
         }
 
+        $lattrs['class'] = implode(' ', $classes);
+
         (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
 
         $this->elementStart('li', $lattrs);