Browse Source

Merge pull request #263 from ajstanley/7.x

7.x
pull/276/merge
Jonathan Green 12 years ago
parent
commit
8533aca038
  1. 4
      includes/solution_packs.inc

4
includes/solution_packs.inc

@ -186,12 +186,10 @@ function islandora_solution_pack_form_submit(array $form, array &$form_state) {
* The context of this batch operation. * The context of this batch operation.
*/ */
function islandora_solution_pack_batch_operation_reingest_object(NewFedoraObject $object, array &$context) { function islandora_solution_pack_batch_operation_reingest_object(NewFedoraObject $object, array &$context) {
$deleted = FALSE;
$existing_object = islandora_object_load($object->id); $existing_object = islandora_object_load($object->id);
if ($existing_object) { if ($existing_object) {
$deleted = islandora_delete_object($existing_object); $deleted = islandora_delete_object($existing_object);
$purged = $deleted && $existing_object == NULL; if (!$deleted) {
if (!$purged) {
$object_link = l($existing_object->label, "islandora/object/{$existing_object->id}"); $object_link = l($existing_object->label, "islandora/object/{$existing_object->id}");
drupal_set_message(t('Failed to purge existing object !object_link.', array( drupal_set_message(t('Failed to purge existing object !object_link.', array(
'!object_link' => $object_link, '!object_link' => $object_link,

Loading…
Cancel
Save