Browse Source

Fixed logical error in islandora_delete_object.

pull/203/head
Nigel Banks 12 years ago
parent
commit
662209ef1a
  1. 2
      includes/globals.inc
  2. 2
      includes/ingest.form.inc

2
includes/globals.inc

@ -121,8 +121,6 @@ function islandora_delete_object(FedoraObject &$object) {
$object = NULL; $object = NULL;
return TRUE; return TRUE;
} }
islandora_post_delete_object($object);
return $object;
} }
/** /**

2
includes/ingest.form.inc

@ -243,7 +243,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
$form_state['redirect'] = "islandora/object/{$object->id}"; $form_state['redirect'] = "islandora/object/{$object->id}";
} catch (Exception $e) { } catch (Exception $e) {
watchdog('islandora', $e->getMessage(), NULL, WATCHDOG_ERROR); // If post hooks throws it may already exist at this point but may be invalid, so don't say failed :P watchdog('islandora', $e->getMessage(), NULL, WATCHDOG_ERROR); // If post hooks throws it may already exist at this point but may be invalid, so don't say failed :P
drupal_set_message(t('A problems occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', array('@label' => $object->label, '@pid' => $object->id)), 'error'); drupal_set_message(t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', array('@label' => $object->label, '@pid' => $object->id)), 'error');
} }
} }
} }

Loading…
Cancel
Save