From beb73ad365b2084cc5bf2c9b9ff0ca1ffdfa9cec Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 7 Sep 2017 21:52:32 -0300 Subject: [PATCH] Simplify logic for clarity. --- islandora.module | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/islandora.module b/islandora.module index 7889946f..29899c1b 100644 --- a/islandora.module +++ b/islandora.module @@ -1693,12 +1693,11 @@ function islandora_object_access($op, $object, $user = NULL) { */ function islandora_islandora_object_access($op, $object, $user) { module_load_include('inc', 'islandora', 'includes/utilities'); + $access = (islandora_namespace_accessible($object->id) && user_access($op, $user)); if (($object->state != 'A') && variable_get('islandora_deny_inactive_and_deleted', FALSE)) { - return islandora_namespace_accessible($object->id) && user_access($op, $user) && user_access(ISLANDORA_ACCESS_INACTIVE_AND_DELETED_OBJECTS, $user); - } - else { - return islandora_namespace_accessible($object->id) && user_access($op, $user); + $access = ($access && user_access(ISLANDORA_ACCESS_INACTIVE_AND_DELETED_OBJECTS, $user)); } + return $access; } /**