Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.327
diff -u -r1.327 common.inc
--- includes/common.inc	24 Feb 2004 20:22:37 -0000	1.327
+++ includes/common.inc	29 Feb 2004 09:54:08 -0000
@@ -719,9 +719,13 @@
  *   to", help text, etc).
  */
 function search_type($type, $action = NULL, $keys = NULL, $options = NULL) {
-  $_POST["edit"]["type"][$type] = "on";
-
-  return search_form($action, $keys, $options) . "<br />". search_data($keys);
+  if (!module_exist('search')) {
+    return t('Search functionality is not available');
+  }
+  else {
+    $_POST["edit"]["type"][$type] = "on";
+    return search_form($action, $keys, $options) . "<br />". search_data($keys);
+  }
 }
 /* @} */
 
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.222
diff -u -r1.222 comment.module
--- modules/comment.module	15 Feb 2004 20:09:46 -0000	1.222
+++ modules/comment.module	29 Feb 2004 09:54:17 -0000
@@ -806,11 +806,13 @@
       menu("admin/comment/comments", t("overview"), "comment_admin", 2);
       menu("admin/comment/comments/0", t("new/updated"), "comment_admin", 1);
       menu("admin/comment/comments/1", t("approval queue"), "comment_admin", 2);
-      menu("admin/comment/search", t("search"), "comment_admin", 8);
       menu("admin/comment/help", t("help"), "comment_help_page", 9);
       menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, MENU_HIDE);
       menu("admin/comment/delete", t("delete comment"), "comment_admin", 0, MENU_HIDE);
-
+      if (module_exist('search')) {
+        menu("admin/comment/search", t("search"), "comment_admin", 8);
+      }
+      
       // comment settings:
       if (user_access("administer moderation")) {
         menu("admin/comment/moderation", t("moderation"), "comment_admin", 3);
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.338
diff -u -r1.338 node.module
--- modules/node.module	26 Feb 2004 17:55:14 -0000	1.338
+++ modules/node.module	29 Feb 2004 09:54:22 -0000
@@ -615,10 +615,12 @@
 
     if (user_access('administer nodes')) {
       menu('admin/node', t('content'), 'node_admin');
-      menu('admin/node/search', t('search'), 'node_admin', 8);
       menu('admin/node/help', t('help'), 'node_help_page', 9);
       menu('admin/node/edit', t('edit post'), 'node_admin', 0, MENU_HIDE);
       menu('admin/node/settings', t('settings'), 'node_admin', 8);
+      if (module_exist('search')) {
+        menu('admin/node/search', t('search'), 'node_admin', 8);
+      }
     }
 
     if (user_access('access content')) {
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.304
diff -u -r1.304 user.module
--- modules/user.module	26 Feb 2004 17:55:14 -0000	1.304
+++ modules/user.module	29 Feb 2004 09:54:30 -0000
@@ -453,9 +453,11 @@
       menu("admin/user/access/user", t("name rules"), "user_admin");
       menu("admin/user/role", t("roles"), "user_admin", 4);
       menu("admin/user/permission", t("permissions"), "user_admin", 5);
-      menu("admin/user/search", t("search"), "user_admin", 8);
       menu("admin/user/help", t("help"), "user_help_page", 9);
       menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE);
+      if (module_exist('search')) {
+        menu("admin/user/search", t("search"), "user_admin", 8);
+      }
     }
   }
 }