summaryrefslogtreecommitdiff
path: root/modules/organize
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-09-16 07:02:22 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-09-16 07:02:22 -0700
commitb8201a71127a096a51ed03e0e08a98a66f847c8f (patch)
treed806f0b9f35fc3aa912126ad3cf8d67c19ec0def /modules/organize
parent15515fd3c64dd626746468862d5b8777679d88f6 (diff)
parentf1887422f8b4ba68dc273fe6f7d3f1123681e89a (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
Diffstat (limited to 'modules/organize')
-rw-r--r--modules/organize/controllers/organize.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 259c94e7..08c80de3 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -45,9 +45,13 @@ class Organize_Controller extends Controller {
access::verify_csrf();
$target_album = ORM::factory("item", $target_album_id);
+ access::required("view", $target_album);
+ access::required("add", $target_album);
+
foreach ($this->input->post("source_ids") as $source_id) {
$source = ORM::factory("item", $source_id);
if (!$source->contains($target_album)) {
+ access::required("edit", $source);
item::move($source, $target_album);
}
}