From 662209ef1a2ba62ae9bc58f2c981418ad376977e Mon Sep 17 00:00:00 2001
From: Nigel Banks <nigel.g.banks@gmail.com>
Date: Mon, 26 Nov 2012 14:48:32 +0000
Subject: [PATCH] Fixed logical error in islandora_delete_object.

---
 includes/globals.inc     | 2 --
 includes/ingest.form.inc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/includes/globals.inc b/includes/globals.inc
index e389d87a..33a50c58 100644
--- a/includes/globals.inc
+++ b/includes/globals.inc
@@ -121,8 +121,6 @@ function islandora_delete_object(FedoraObject &$object) {
       $object = NULL;
       return TRUE;
   }
-  islandora_post_delete_object($object);
-  return $object;
 }
 
 /**
diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc
index 524b27f1..d6381436 100644
--- a/includes/ingest.form.inc
+++ b/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}";
     } 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
-      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');
     }
   }
 }