diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-10 06:21:10 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-10 06:21:10 -0700 |
| commit | 90764b02e4e295847a2b084d341aaa70d423c136 (patch) | |
| tree | 534737c9f118f4241a2c1dec5c9175b9e26a4755 | |
| parent | 3f4868aac5d5248d3cd5721601c737bf646f3fc1 (diff) | |
| parent | eb345cb8702f3443087c7fab815301c0a08281a3 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
| -rw-r--r-- | modules/organize/controllers/organize.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 27299e85..0611c334 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->is_descendant($source)) { + if ($album->id != $source->parent_id && $album->id != $source->id) { item::move($source, $album); } } |