Index: wikitools.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wikitools/Attic/wikitools.admin.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 wikitools.admin.inc
--- wikitools.admin.inc	20 Sep 2009 16:02:10 -0000	1.1.2.3
+++ wikitools.admin.inc	11 Feb 2011 03:39:07 -0000
@@ -10,6 +10,11 @@
  * Callback for wikitools settings form.
  */
 function wikitools_admin_settings() {
+  if (!module_exists('search')) {
+    drupal_set_message(t('You will not be able to select the "Node Search" or "Link to search" options until you <a href="!url">enable</a> the search module.',
+      array('!url' => url('admin/modules'))), 'warning');
+  }
+
   $form = array();
 
   list($select_query, $count_query, $arguments) = _wikitools_duplicate_nodes_query();
Index: wikitools.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wikitools/wikitools.module,v
retrieving revision 1.4.2.13
diff -u -p -r1.4.2.13 wikitools.module
--- wikitools.module	18 Jun 2009 04:25:27 -0000	1.4.2.13
+++ wikitools.module	11 Feb 2011 03:39:07 -0000
@@ -140,7 +140,11 @@ function wikitools_404($value = NULL) {
  */
 function wikitools_disallowed_characters($value = NULL) {
   if (is_null($value)) {
-    return variable_get('wikitools_disallowed_characters', '[]{}|');
+    $variable = variable_get('wikitools_404_type', drupal_map_assoc(array('Link to creation')));
+    if (!module_exists('search')) {
+      unset($variable['Link to search']);
+    }
+    return $variable;
   }
   variable_set('wikitools_disallowed_characters', $value);
 }
@@ -149,7 +153,11 @@ function wikitools_disallowed_characters
  * Various wikitool options.
  */
 function wikitools_options() {
-  return variable_get('wikitools_options', drupal_map_assoc(array('node creation', 'node search', 'unique titles', 'underscore as space')));
+  $variable = variable_get('wikitools_options', drupal_map_assoc(array('node creation', 'node search', 'unique titles', 'underscore as space')));
+  if (!module_exists('search')) {
+    unset($variable['node search']);
+  }
+  return $variable;
 }
 
 /**