Browse Source

not bubling permissions

pull/376/head
William Panting 11 years ago
parent
commit
d7645ce1e7
  1. 7
      islandora.module

7
islandora.module

@ -1317,7 +1317,7 @@ function islandora_islandora_object_access($op, $object, $user) {
/** /**
* Hookable access callback for datastreams. * Hookable access callback for datastreams.
* *
* Requires the equivalent permissions on the object. * Positive permissions on object access suggests on the datastream.
*/ */
function islandora_datastream_access($op, $datastream, $user = NULL) { function islandora_datastream_access($op, $datastream, $user = NULL) {
$cache = &drupal_static(__FUNCTION__); $cache = &drupal_static(__FUNCTION__);
@ -1346,10 +1346,9 @@ function islandora_datastream_access($op, $datastream, $user = NULL) {
$user, $user,
)); ));
// Neither the object nor the datastream check returned FALSE, and one in // The datastream check returned FALSE, and one in the object or datastream
// the object or datastream checks returned TRUE. // checks returned TRUE.
$cache[$op][$datastream->parent->id][$datastream->id][$user->uid] = ( $cache[$op][$datastream->parent->id][$datastream->id][$user->uid] = (
!in_array(FALSE, $object_results, TRUE) &&
!in_array(FALSE, $datastream_results, TRUE) && !in_array(FALSE, $datastream_results, TRUE) &&
(in_array(TRUE, $object_results, TRUE) || in_array(TRUE, $datastream_results, TRUE)) (in_array(TRUE, $object_results, TRUE) || in_array(TRUE, $datastream_results, TRUE))
); );

Loading…
Cancel
Save