A better fix for #741... the original problem was that the source and album variables were reversed

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 0611c334..99563327 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -47,7 +47,7 @@ class Organize_Controller extends Controller {
     $album = ORM::factory("item", $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) {
+      if (!$source->is_descendant($album)) {
         item::move($source, $album);
       }
     }