Pass along the from_id when editing albums in the context menu, and

also pass it along in the form creation code.  This fixes ticket #1183.

3 files changed, 10 insertions, 11 deletions

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 0baae631..0ac5e8b0 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -58,7 +58,7 @@ class album_Core {
   static function get_edit_form($parent) {
     $form = new Forge(
       "albums/update/{$parent->id}", "", "post", array("id" => "g-edit-album-form"));
-    $form->hidden("from_id");
+    $form->hidden("from_id")->value($parent->id);
     $group = $form->group("edit_item")->label(t("Edit Album"));
 
     $group->input("title")->label(t("Title"))->value($parent->title)
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 272fd205..ba6dd99d 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -249,7 +249,7 @@ class gallery_event_Core {
             $options_menu->append(Menu::factory("dialog")
                                   ->id("edit_item")
                                   ->label($edit_text)
-                                  ->url(url::site("form/edit/{$item->type}s/$item->id")));
+                                  ->url(url::site("form/edit/{$item->type}s/$item->id?from_id={$item->id}")));
           }
 
           if ($item->is_album()) {
@@ -263,7 +263,6 @@ class gallery_event_Core {
         }
 
         $csrf = access::csrf_token();
-        $theme_item = $theme->item();
         $page_type = $theme->page_type();
         if ($can_edit && $item->is_photo() && graphics::can("rotate")) {
           $options_menu
@@ -274,7 +273,7 @@ class gallery_event_Core {
               ->css_class("ui-icon-rotate-ccw")
               ->ajax_handler("function(data) { " .
                              "\$.gallery_replace_image(data, \$('$item_css_selector')) }")
-              ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")))
+              ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&from_id={$item->id}&page_type=$page_type")))
             ->append(
               Menu::factory("ajax_link")
               ->id("rotate_cw")
@@ -282,7 +281,7 @@ class gallery_event_Core {
               ->css_class("ui-icon-rotate-cw")
               ->ajax_handler("function(data) { " .
                              "\$.gallery_replace_image(data, \$('$item_css_selector')) }")
-              ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")));
+              ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&from_id={$item->id}&page_type=$page_type")));
         }
 
         if ($item->id != item::root()->id) {
@@ -315,7 +314,7 @@ class gallery_event_Core {
                 ->label($delete_text)
                 ->css_class("ui-icon-trash")
                 ->css_class("g-quick-delete")
-                ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")));
+                ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&from_id={$item->id}&page_type=$page_type")));
           }
         }
       }
@@ -416,7 +415,7 @@ class gallery_event_Core {
                             ->id("edit")
                             ->label($edit_title)
                             ->css_class("ui-icon-pencil")
-                            ->url(url::site("quick/form_edit/$item->id?from_id=$theme_item->id")));
+                            ->url(url::site("quick/form_edit/$item->id?from_id={$theme_item->id}")));
 
       if ($item->is_photo() && graphics::can("rotate")) {
         $options_menu
@@ -427,7 +426,7 @@ class gallery_event_Core {
             ->css_class("ui-icon-rotate-ccw")
             ->ajax_handler("function(data) { " .
                            "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
-            ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")))
+            ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&from_id={$theme_item->id}&page_type=$page_type")))
           ->append(
             Menu::factory("ajax_link")
             ->id("rotate_cw")
@@ -435,7 +434,7 @@ class gallery_event_Core {
             ->css_class("ui-icon-rotate-cw")
             ->ajax_handler("function(data) { " .
                            "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
-            ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")));
+            ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&from_id={$theme_item->id}&page_type=$page_type")));
       }
 
       // @todo Don't move photos from the photo page; we don't yet have a good way of redirecting
@@ -474,7 +473,7 @@ class gallery_event_Core {
                    ->id("delete")
                    ->label($delete_title)
                    ->css_class("ui-icon-trash")
-                   ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")));
+                   ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&from_id={$theme_item->id}&page_type=$page_type")));
       }
 
       if ($item->is_album()) {
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 6333eaf2..bbb5b66c 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -26,7 +26,7 @@
 class movie_Core {
   static function get_edit_form($movie) {
     $form = new Forge("movies/update/$movie->id", "", "post", array("id" => "g-edit-movie-form"));
-    $form->hidden("from_id");
+    $form->hidden("from_id")->value($movie->id);
     $group = $form->group("edit_item")->label(t("Edit Movie"));
     $group->input("title")->label(t("Title"))->value($movie->title)
       ->error_messages("required", t("You must provide a title"))