Merge commit 'upstream/master'

1 files changed, 3 insertions, 2 deletions

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index c8227d74..1391c4b4 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -70,7 +70,8 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    $form = photo::get_edit_form($photo);
+    $view = photo::get_edit_form($photo);
+    $form = $view->form;
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
       if (Database::instance()
@@ -101,7 +102,7 @@ class Movies_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $form->__toString()));
+              "form" => $view->__toString()));
     }
   }