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

This commit is contained in:
Tim Almdal
2009-09-19 09:34:27 -07:00
parent 4e6f2f1b4c
commit cf89015a29
2 changed files with 23 additions and 23 deletions

View File

@@ -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")));
}
}
}