From 462b87485cad0f30b1eaf004669dda9ae2548867 Mon Sep 17 00:00:00 2001
From: nikrou <nikrou@piwigo.org>
Date: Thu, 19 Mar 2009 21:39:38 +0000
Subject: merge r3216 from trunk to branch 2.0

feature_948_accordion feature 948 : fix problem with incorrect submenu open in admin use a new variable (U_ACTIVE_MENU) and use default position defined in selected_admin_menu if not exists

git-svn-id: http://piwigo.org/svn/branches/2.0@3217 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/template/goto/admin.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'admin/template/goto')

diff --git a/admin/template/goto/admin.tpl b/admin/template/goto/admin.tpl
index 02d4f9b5f..5beb34d13 100644
--- a/admin/template/goto/admin.tpl
+++ b/admin/template/goto/admin.tpl
@@ -7,7 +7,7 @@ jQuery().ready(function(){ldelim}
   jQuery('#menubar').accordion({ldelim}
     header: "dt.rdion",
     event: "click",
-    active: {$themeconf.selected_admin_menu}
+    active: {$U_ACTIVE_MENU|default:$themeconf.selected_admin_menu}
   });
 });
 </script>
-- 
cgit v1.2.3