diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-06-03 19:01:57 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-06-03 19:01:57 -0600 |
| commit | 3845dba196e4684b188c1fda9ee328ce70a3e7a8 (patch) | |
| tree | a0466988aa45732a25fc8138d50129e64524ff32 /modules/server_add/helpers/server_add_menu.php | |
| parent | 6fa9a43d8781565c478c25282ac18a0c1d3a503b (diff) | |
| parent | dd854379c20722a763ae7fe3d097a57a544cae80 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add/helpers/server_add_menu.php')
| -rw-r--r-- | modules/server_add/helpers/server_add_menu.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/server_add/helpers/server_add_menu.php b/modules/server_add/helpers/server_add_menu.php index bcfe208b..23878913 100644 --- a/modules/server_add/helpers/server_add_menu.php +++ b/modules/server_add/helpers/server_add_menu.php @@ -30,7 +30,7 @@ class server_add_menu_Core { $item = $theme->item(); $paths = unserialize(module::get_var("server_add", "authorized_paths")); - if (user::active()->admin && $item->is_album() && !empty($paths)) { + if ($item && user::active()->admin && $item->is_album() && !empty($paths)) { // This is a little tricky. Normally there's an "Add Photo" menu option, but we want to // turn that into a dropdown if there are two different ways to add things. Do that in a // portable way for now. If we find ourselves duplicating this pattern, we should make an |