From bb635ccbcdfe27e22b3c5e04cb1fa1dd13193f50 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Tue, 11 Jun 2013 13:43:02 -0300 Subject: [PATCH] The namespace check is handled via the hooked access callback. --- islandora.module | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/islandora.module b/islandora.module index 504d9940..0a676c76 100644 --- a/islandora.module +++ b/islandora.module @@ -442,7 +442,6 @@ function islandora_user_access($object, array $permissions, $content_models = ar } // Check for access. - $accessible_namespace = islandora_namespace_accessible($object->id); if ($access_any) { $has_required_permissions = function ($permissions, $content_models, $datastream, $object, $user) { foreach ($permissions as $p) { @@ -478,8 +477,7 @@ function islandora_user_access($object, array $permissions, $content_models = ar $has_required_content_models = count(array_diff($content_models, $object->models)) == 0; } - return $accessible_namespace && - $has_required_permissions($permissions, $content_models, $datastream, $object, $account) && + return $has_required_permissions($permissions, $content_models, $datastream, $object, $account) && $has_required_content_models; }