From 0e268aa0f415543ed4306d86d928e7499f843607 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 10 Jul 2008 01:44:18 +0000
Subject:  - Patch #273129 by pwolanin: adding class active-trail should not
 remove previous attributes.

---
 includes/menu.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/menu.inc b/includes/menu.inc
index a94beb298..cc4b10dac 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1315,7 +1315,12 @@ function menu_navigation_links($menu_name, $level = 0) {
       $l['href'] = $item['link']['href'];
       $l['title'] = $item['link']['title'];
       if ($item['link']['in_active_trail']) {
-        $l['attributes'] = array('class' => 'active-trail');
+        if (empty($l['attributes']['class'])) {
+          $l['attributes']['class'] = 'active-trail';
+        }
+        else {
+          $l['attributes']['class'] .= ' active-trail';
+        }
       }
       // Keyed with unique menu id to generate classes from theme_links().
       $links['menu-' . $item['link']['mlid']] = $l;
-- 
cgit v1.2.3