Change the fix for ticket #775 to always add the Add menu, but not add any items if the album directory is not writable.

1 files changed, 7 insertions, 9 deletions

diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php
index 28996ee2..4db83f74 100644
--- a/modules/server_add/helpers/server_add_event.php
+++ b/modules/server_add/helpers/server_add_event.php
@@ -30,15 +30,13 @@ 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)) {
-      $add_menu = $menu->get("add_menu");
-      if ($add_menu) {
-        $add_menu
-          ->append(Menu::factory("dialog")
-                   ->id("server_add")
-                   ->label(t("Server add"))
-                   ->url(url::site("server_add/browse/$item->id")));
-      }
+    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")
+                 ->label(t("Server add"))
+                 ->url(url::site("server_add/browse/$item->id")));
     }
   }
 }