Browse Source

Merge pull request #642 from adam-vessey/7.x-ISLANDORA-1586

Change existence check to use islandora_object_load().
pull/648/head
Jordan Dukart 9 years ago
parent
commit
e93ecc4f75
  1. 8
      includes/solution_packs.inc

8
includes/solution_packs.inc

@ -386,7 +386,6 @@ function islandora_install_solution_pack($module, $op = 'install', $force = FALS
drupal_set_message(filter_xss($msg), 'error'); drupal_set_message(filter_xss($msg), 'error');
return; return;
} }
$connection = islandora_get_tuque_connection();
$required_objects = islandora_solution_packs_get_required_objects($module); $required_objects = islandora_solution_packs_get_required_objects($module);
$objects = $required_objects['objects']; $objects = $required_objects['objects'];
$status_messages = array( $status_messages = array(
@ -474,13 +473,10 @@ function islandora_uninstall_solution_pack($module, $force = FALSE) {
drupal_set_message(filter_xss($msg), 'error'); drupal_set_message(filter_xss($msg), 'error');
return; return;
} }
$connection = islandora_get_tuque_connection();
$required_objects = islandora_solution_packs_get_required_objects($module); $required_objects = islandora_solution_packs_get_required_objects($module);
$objects = $required_objects['objects']; $objects = $required_objects['objects'];
$filter = function($o) use($connection) { $filter = function ($o) {
$param = "pid={$o->id}"; return islandora_object_load($o->id);
$query = $connection->api->a->findObjects('query', $param);
return !empty($query['results']);
}; };
$existing_objects = array_filter($objects, $filter); $existing_objects = array_filter($objects, $filter);

Loading…
Cancel
Save