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

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index 87b73436..14513fdc 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -32,7 +32,7 @@ class Move_Controller extends Controller {
   public function save($source_id) {
     access::verify_csrf();
     $source = ORM::factory("item", $source_id);
-    $target = ORM::factory("item", $this->input->post("target_id"));
+    $target = ORM::factory("item", Input::instance()->post("target_id"));
 
     access::required("view", $source);
     access::required("edit", $source);
@@ -64,8 +64,8 @@ class Move_Controller extends Controller {
     $view->parent = $target;
     $view->children = ORM::factory("item")
       ->viewable()
-      ->where("type", "album")
-      ->where("parent_id", $target->id)
+      ->where("type", "=", "album")
+      ->where("parent_id", "=", $target->id)
       ->find_all();
     return $view;
   }