1 files changed, 17 insertions, 11 deletions

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 575b2b60..7a8e4d2a 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -26,7 +26,7 @@ class Movies_Controller extends Items_Controller {
     }
     access::required("view", $movie);
 
-    $where = array("type != " => "album");
+    $where = array(array("type", "!=", "album"));
     $position = $movie->parent()->get_position($movie, $where);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =
@@ -76,16 +76,16 @@ class Movies_Controller extends Items_Controller {
       if ($form->edit_item->filename->value != $movie->name ||
           $form->edit_item->slug->value != $movie->slug) {
         // Make sure that there's not a name or slug conflict
-        if ($row = Database::instance()
+        if ($row = db::build()
             ->select(array("name", "slug"))
             ->from("items")
-            ->where("parent_id", $movie->parent_id)
-            ->where("id <>", $movie->id)
-            ->open_paren()
-            ->where("name", $form->edit_item->filename->value)
-            ->orwhere("slug", $form->edit_item->slug->value)
-            ->close_paren()
-            ->get()
+            ->where("parent_id", "=", $movie->parent_id)
+            ->where("id", "<>", $movie->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->filename->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
+            ->close()
+            ->execute()
             ->current()) {
           if ($row->name == $form->edit_item->filename->value) {
             $form->edit_item->filename->add_error("name_conflict", 1);
@@ -110,8 +110,13 @@ class Movies_Controller extends Items_Controller {
       message::success(
         t("Saved movie %movie_title", array("movie_title" => $movie->title)));
 
-      print json_encode(
-        array("result" => "success"));
+      if ($form->from_id->value == $movie->id) {
+        // Use the new url; it might have changed.
+        print json_encode(array("result" => "success", "location" => $movie->url()));
+      } else {
+        // Stay on the same page
+        print json_encode(array("result" => "success"));
+      }
     } else {
       print json_encode(
         array("result" => "error",
@@ -123,6 +128,7 @@ class Movies_Controller extends Items_Controller {
     $movie = ORM::factory("item", $movie_id);
     access::required("view", $movie);
     access::required("edit", $movie);
+
     print movie::get_edit_form($movie);
   }
 }