Browse Source

Removed module_load_include in global space, corrected parameters in function call to islandora_post_delete. Fixed documentation error.

pull/203/head
Nigel Banks 12 years ago
parent
commit
f9041ee4fa
  1. 4
      includes/globals.inc
  2. 2
      islandora.module

4
includes/globals.inc

@ -113,7 +113,7 @@ function islandora_delete_object(FedoraObject &$object) {
return FALSE; return FALSE;
case 'delete': // Change the state to deleted. case 'delete': // Change the state to deleted.
$object->delete(); $object->delete();
islandora_post_delete_object($object, $object_id, $models); islandora_post_delete_object($object_id, $models);
return TRUE; return TRUE;
default: // Purge default: // Purge
$object->repository->purgeObject($object_id); $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 * @param string $object_id
* The object id of an the recently deleted object. * The object id of an the recently deleted object.

2
islandora.module

@ -20,7 +20,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with the program. If not, see <http ://www.gnu.org/licenses/>. * along with the program. If not, see <http ://www.gnu.org/licenses/>.
*/ */
module_load_include('inc', 'islandora', 'includes/globals'); require_once __DIR__ . "/includes/globals.inc";
// Common datastreams // Common datastreams
define('DS_COMP_STREAM', 'DS-COMPOSITE-MODEL'); define('DS_COMP_STREAM', 'DS-COMPOSITE-MODEL');

Loading…
Cancel
Save