Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 6 insertions, 8 deletions

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 30a5d78c..c8227d74 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -77,21 +77,19 @@ class Movies_Controller extends Items_Controller {
           ->from("items")
           ->where("parent_id", $photo->parent_id)
           ->where("id <>", $photo->id)
-          ->where("name", $form->edit_photo->filename->value)
+          ->where("name", $form->edit_item->filename->value)
           ->count_records()) {
-        $form->edit_photo->filename->add_error("conflict", 1);
+        $form->edit_item->filename->add_error("conflict", 1);
         $valid = false;
       }
     }
 
     if ($valid) {
-      $orig = clone $photo;
-      $photo->title = $form->edit_photo->title->value;
-      $photo->description = $form->edit_photo->description->value;
-      $photo->rename($form->edit_photo->filename->value);
+      $photo->title = $form->edit_item->title->value;
+      $photo->description = $form->edit_item->description->value;
+      $photo->rename($form->edit_item->filename->value);
       $photo->save();
-
-      module::event("item_updated", $orig, $photo);
+      module::event("item_edit_form_completed", $photo, $form);
 
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(