Browse Source

Adds check for invalid PIDs to islandora_object_load fails (#689)

* Adds check for invalid PIDs to islandora_object_load fails

* Reordered invalid PID check to catch more invalidity cases

* Exploring the logical limits of Drupal Coding Style

* Removes watchdog logging when islandora_load_object gets a malformed PID
pull/691/head
Bryan J. Brown 7 years ago committed by Diego Pino Navarro
parent
commit
9b37dcc9b8
  1. 7
      islandora.module

7
islandora.module

@ -1226,7 +1226,12 @@ function islandora_object_load($object_id) {
return $tuque->repository->getObject(urldecode($object_id)); return $tuque->repository->getObject(urldecode($object_id));
} }
catch (Exception $e) { catch (Exception $e) {
if ($e->getCode() == '404') { // Check to see if tuque failure is due to invalid PID.
module_load_include('inc', 'islandora', 'includes/utilities');
if (!islandora_is_valid_pid($object_id)) {
return FALSE;
}
elseif ($e->getCode() == '404') {
return FALSE; return FALSE;
} }
else { else {

Loading…
Cancel
Save