Browse Source

Remove copypasta and fix .api.

pull/685/head
Rosie Le Faive 7 years ago
parent
commit
0f0e84ed35
  1. 8
      islandora.api.php
  2. 7
      islandora.module

8
islandora.api.php

@ -597,8 +597,8 @@ function hook_cmodel_pid_islandora_object_access($op, $object, $user) {
* @param string $op
* A string define an operation to check. Should be defined via
* hook_permission().
* @param AbstractDatastream $object
* An object to check the operation on.
* @param AbstractDatastream $datastream
* A datastream to check the operation on.
* @param object $user
* A loaded user object, as the global $user variable might contain.
*
@ -608,7 +608,7 @@ function hook_cmodel_pid_islandora_object_access($op, $object, $user) {
* about the outcome. Can also be an array containing multiple
* TRUE/FALSE/NULLs, due to how hooks work.
*/
function hook_islandora_datastream_access($op, AbstractObject $object, $user) {
function hook_islandora_datastream_access($op, AbstractDatastream $datastream, $user) {
switch ($op) {
case 'create stuff':
return TRUE;
@ -626,7 +626,7 @@ function hook_islandora_datastream_access($op, AbstractObject $object, $user) {
*
* @see hook_islandora_datastream_access()
*/
function hook_cmodel_pid_islandora_datastream_access($op, $object, $user) {
function hook_cmodel_pid_islandora_datastream_access($op, $datastream, $user) {
}

7
islandora.module

@ -1962,12 +1962,7 @@ function islandora_islandora_metadata_display_info() {
* Implements hook_islandora_datastream_access().
*/
function islandora_islandora_datastream_access($op, AbstractDatastream $datastream, $user) {
module_load_include('inc', 'islandora', 'includes/utilities');
$result = islandora_namespace_accessible($datastream->parent->id) && user_access($op, $user);
if (($datastream->parent->state != 'A') && variable_get('islandora_deny_inactive_and_deleted', FALSE)) {
$result = ($result && user_access(ISLANDORA_ACCESS_INACTIVE_AND_DELETED_OBJECTS, $user));
}
$result = islandora_islandora_object_access($op, $datastream->parent, $user);
if ($result && $op == ISLANDORA_REGENERATE_DERIVATIVES) {
module_load_include('inc', 'islandora', 'includes/derivatives');

Loading…
Cancel
Save