From 9f410ec764cdb8ece4dc6ce1fb1754afad929335 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 21 Jul 2009 15:49:42 -0700
Subject: Always display the option menu so that modules with options that
 require menu items with view permission have somewhere to hang these menu
 items from.  If its empty it will get removed by $menu->compact()

---
 modules/gallery/helpers/gallery_menu.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
index b6f763b8..040b19e1 100644
--- a/modules/gallery/helpers/gallery_menu.php
+++ b/modules/gallery/helpers/gallery_menu.php
@@ -19,8 +19,6 @@
  */
 class gallery_menu_Core {
   static function site($menu, $theme) {
-    $is_admin = user::active()->admin;
-
     $menu->append(Menu::factory("link")
                   ->id("home")
                   ->label(t("Home"))
@@ -28,8 +26,8 @@ class gallery_menu_Core {
 
     $item = $theme->item();
 
-    $can_edit = $item && access::can("edit", $item) || $is_admin;
-    $can_add = $item && (access::can("add", $item) || $is_admin);
+    $can_edit = $item && access::can("edit", $item);
+    $can_add = $item && access::can("add", $item);
 
     if ($can_add) {
       $menu->append(Menu::factory("dialog")
@@ -38,11 +36,10 @@ class gallery_menu_Core {
                     ->url(url::site("simple_uploader/app/$item->id")));
     }
 
-    if ($item && $can_edit || $can_add) {
-      $menu->append($options_menu = Menu::factory("submenu")
-                    ->id("options_menu")
-                    ->label(t("Options")));
-
+    $menu->append($options_menu = Menu::factory("submenu")
+                  ->id("options_menu")
+                  ->label(t("Options")));
+    if ($item && ($can_edit || $can_add)) {
       if ($can_edit) {
         $options_menu
           ->append(Menu::factory("dialog")
@@ -71,7 +68,7 @@ class gallery_menu_Core {
       }
     }
 
-    if ($is_admin) {
+    if (user::active()->admin) {
       $menu->append($admin_menu = Menu::factory("submenu")
                     ->id("admin_menu")
                     ->label(t("Admin")));
-- 
cgit v1.2.3