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

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 0611c334..4639777c 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -41,14 +41,14 @@ class Organize_Controller extends Controller {
             "sort_order" => $album->sort_order));
   }
 
-  function move_to($album_id) {
+  function move_to($target_album_id) {
     access::verify_csrf();
 
-    $album = ORM::factory("item", $album_id);
+    $target_album = ORM::factory("item", $target_album_id);
     foreach ($this->input->post("source_ids") as $source_id) {
       $source = ORM::factory("item", $source_id);
-      if ($album->id != $source->parent_id && $album->id != $source->id) {
-        item::move($source, $album);
+      if (!$source->contains($target_album)) {
+        item::move($source, $target_album);
       }
     }