From 3fd692b390c7163acb225bf1e85dc2b482440bbd Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 19 Jul 2010 21:57:49 +0000
Subject: - Patch #767478 by derjochenmeyer: menu li.leaf items get expanded
 (li.expanded) when active.

---
 includes/menu.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'includes')

diff --git a/includes/menu.inc b/includes/menu.inc
index 2b6738413..d79621f93 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -922,8 +922,10 @@ function menu_tree_output($tree) {
     if ($i == $num_items - 1) {
       $class[] = 'last';
     }
-    // Set a class if the link has children.
-    if ($data['below']) {
+    // Set a class for the <li>-tag. Since $data['below'] may contain local
+    // tasks, only set 'expanded' class if the link also has children within
+    // the current menu.
+    if ($data['link']['has_children'] && $data['below']) {
       $class[] = 'expanded';
     }
     elseif ($data['link']['has_children']) {
-- 
cgit v1.2.3