diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
| commit | e5a78d39ec49332054cbc1a398d7c110e1d9191c (patch) | |
| tree | c2acb4731a381b7a1b28fa5ed505a76adb23a3ef /modules/server_add/helpers | |
| parent | 529ded3388673036314eefd5bfb1cfc0b76f7f9e (diff) | |
| parent | 33690a32bcf132e5ab470ff77ba23c073ac26271 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/albums.php
Diffstat (limited to 'modules/server_add/helpers')
| -rw-r--r-- | modules/server_add/helpers/server_add_event.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php index b9dd8c28..4db83f74 100644 --- a/modules/server_add/helpers/server_add_event.php +++ b/modules/server_add/helpers/server_add_event.php @@ -30,7 +30,8 @@ class server_add_event_Core { $item = $theme->item(); $paths = unserialize(module::get_var("server_add", "authorized_paths")); - if ($item && user::active()->admin && $item->is_album() && !empty($paths)) { + if ($item && user::active()->admin && $item->is_album() && !empty($paths) && + is_writable($item->is_album() ? $item->file_path() : $item->parent()->file_path())) { $menu->get("add_menu") ->append(Menu::factory("dialog") ->id("server_add") |