Index: wikitools.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wikitools/wikitools.module,v
retrieving revision 1.4.2.6
diff -u -p -r1.4.2.6 wikitools.module
--- wikitools.module	25 Feb 2008 21:56:24 -0000	1.4.2.6
+++ wikitools.module	17 Jun 2008 21:02:53 -0000
@@ -71,18 +71,6 @@ function wikitools_menu() {
   return $items;
 }
 
-/**
- * Implementation of hook_menu_alter().
- */
-function wikitools_menu_alter(&$callbacks) {
-  // Override the callback for node deletion if the delete protection option is set.
-  if (wikitools_delete_protection()) {
-    // Hijack delete callback and call custom handler.
-    $callbacks['node/%node/delete']['page callback'] = 'wikitools_delete_protection_delete_confirm';
-    $callbacks['node/%node/delete']['page arguments'] = array(1);
-  }
-}
-
 /*
  * Settings
  */
@@ -184,14 +172,6 @@ function wikitools_node_search() {
 }
 
 /**
- * Is delete protection activated?
- */
-function wikitools_delete_protection() {
-  $options = wikitools_options();
-  return $options['delete protection'];
-}
-
-/**
  * Is move protection activated?
  */
 function wikitools_move_protection() {
@@ -439,9 +419,6 @@ function wikitools_form_alter(&$form, $f
     if (wikitools_type_affected($form['type']['#value'])) {
       if ($form['nid']['#value']) {
         // Node is edited.
-        if (wikitools_delete_protection() && !user_access('administer nodes')) {
-          unset($form['buttons']['delete']);
-        }
         if (wikitools_move_protection() && !user_access('administer nodes')) {
           $form['title']['#disabled'] = TRUE;
         }
@@ -457,19 +434,6 @@ function wikitools_form_alter(&$form, $f
 }
 
 /**
- * Callback of node delete action in protected mode.
- */
-function wikitools_delete_protection_delete_confirm(&$node) {
-  if (!wikitools_type_affected($node->type) || user_access('administer nodes')) {
-    // Call original function.
-    return drupal_get_form('node_delete_confirm', $node);
-  }
-  else {
-    return drupal_access_denied();
-  }
-}
-
-/**
  * Implementation of hook_theme().
  */
 function wikitools_theme() {