diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-05-31 23:28:42 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-05-31 23:28:42 -0700 |
| commit | 3c24d9476618496c8f2e1ca2f6025fa157120e43 (patch) | |
| tree | e3d8b381098affa3081cc95cd74ebeabef972ab3 /modules/gallery/helpers/gallery_menu.php | |
| parent | 463b3454ae7633815e24cdf86e81c57409dd15a9 (diff) | |
| parent | 79a05adb9d941671cefbdf6b1cc97f0cd84fabf3 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/gallery_menu.php')
| -rw-r--r-- | modules/gallery/helpers/gallery_menu.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php index 0f0e676d..09c2d91a 100644 --- a/modules/gallery/helpers/gallery_menu.php +++ b/modules/gallery/helpers/gallery_menu.php @@ -28,8 +28,8 @@ class gallery_menu_Core { $item = $theme->item(); - $can_edit = access::can("edit", $item) || $is_admin; - $can_add = access::can("add", $item) || $is_admin; + $can_edit = $item && access::can("edit", $item) || $is_admin; + $can_add = $item && (access::can("add", $item) || $is_admin); if ($item && $can_edit || $can_add) { $menu->append($options_menu = Menu::factory("submenu") |