Code
/
islandora
7
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Pass the content models...

pull/352/head
Adam Vessey 12 years ago
parent
594adab668
commit
2a654d6e83
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      islandora.module

8
islandora.module
Unescape View File

@ -444,7 +444,7 @@ function islandora_user_access($object, array $permissions, $content_models = ar
// Check for access. // Check for access.
$accessible_namespace = islandora_namespace_accessible($object->id); $accessible_namespace = islandora_namespace_accessible($object->id);
if ($access_any) { if ($access_any) {
$has_required_permissions = function ($permissions, $datastream, $object, $user) { $has_required_permissions = function ($permissions, $content_models, $datastream, $object, $user) {
foreach ($permissions as $p) { foreach ($permissions as $p) {
if ($datastream !== NULL) { if ($datastream !== NULL) {
$check = islandora_datastream_access($p, $datastream, $user); $check = islandora_datastream_access($p, $datastream, $user);
@ -458,10 +458,10 @@ function islandora_user_access($object, array $permissions, $content_models = ar
} }
} }
}; };
$has_required_content_models = empty($content_models) ? TRUE : count(array_intersect($object->models, $content_models)) > 0; $has_required_content_models = empty($content_models) ? TRUE : (count(array_intersect($object->models, $content_models)) > 0);
} }
else { else {
$has_required_permissions = function ($permissions, $datastream, $object, $user) { $has_required_permissions = function ($permissions, $content_models, $datastream, $object, $user) {
foreach ($permissions as $p) { foreach ($permissions as $p) {
if ($datastream !== NULL) { if ($datastream !== NULL) {
$check = islandora_datastream_access($p, $datastream, $user); $check = islandora_datastream_access($p, $datastream, $user);
@ -479,7 +479,7 @@ function islandora_user_access($object, array $permissions, $content_models = ar
} }
return $accessible_namespace && return $accessible_namespace &&
$has_required_permissions($permissions, $datastream, $object, $account) && $has_required_permissions($permissions, $content_models, $datastream, $object, $account) &&
$has_required_content_models; $has_required_content_models;
} }

Write Preview
Loading…
Cancel
Save