From f9041ee4fa213adf3ea2375f2c4e86f4acb42b7e Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Mon, 26 Nov 2012 15:56:52 +0000 Subject: [PATCH] Removed module_load_include in global space, corrected parameters in function call to islandora_post_delete. Fixed documentation error. --- includes/globals.inc | 4 ++-- islandora.module | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/globals.inc b/includes/globals.inc index 33a50c58..30659e60 100644 --- a/includes/globals.inc +++ b/includes/globals.inc @@ -113,7 +113,7 @@ function islandora_delete_object(FedoraObject &$object) { return FALSE; case 'delete': // Change the state to deleted. $object->delete(); - islandora_post_delete_object($object, $object_id, $models); + islandora_post_delete_object($object_id, $models); return TRUE; default: // Purge $object->repository->purgeObject($object_id); @@ -142,7 +142,7 @@ function islandora_pre_delete_object(FedoraObject $object) { } /** - * Calls the ISLANDORA_POST_INGEST_HOOK hooks. + * Calls the ISLANDORA_POST_PURGE_OBJECT_HOOK hooks. * * @param string $object_id * The object id of an the recently deleted object. diff --git a/islandora.module b/islandora.module index 1216e9ed..3f649f74 100644 --- a/islandora.module +++ b/islandora.module @@ -20,7 +20,7 @@ * You should have received a copy of the GNU General Public License * along with the program. If not, see . */ -module_load_include('inc', 'islandora', 'includes/globals'); +require_once __DIR__ . "/includes/globals.inc"; // Common datastreams define('DS_COMP_STREAM', 'DS-COMPOSITE-MODEL');