summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/helpers')
-rw-r--r--modules/gallery/helpers/access.php17
1 files changed, 3 insertions, 14 deletions
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 79394d35..8c6f5d54 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -95,24 +95,13 @@ class access_Core {
return false;
}
- if ($user->admin) {
+ if ($user->admin && $item->owner_id == $user->id) {
return true;
}
- print "Before owner id check\n";
- if ($item->owner_id == $user->id &&
- in_array($perm_name, array("view_full", "edit", "add"))) {
- return true;
- }
-
- if ($perm_name == "view") {
- $resource = $item->owner_id == $user->id ? $item->parent() : $item;
- } else {
- $resource = model_cache::get("access_cache", $item->id, "item_id");
- }
- print Kohana::debug($resource->as_array()) . "\n";
+ $resource = $perm_name == "view" ?
+ $item : model_cache::get("access_cache", $item->id, "item_id");
foreach ($user->groups as $group) {
- print "$group->name\n";
if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
return true;
}