- Patch #6129 by Goba: fixed dependencies on search module.

6 files changed, 18 insertions, 6 deletions

diff --git a/modules/comment.module b/modules/comment.module
index 38c25fc45..2917be5ec 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -806,10 +806,12 @@ function comment_link($type, $node = 0, $main = 0) {
       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")) {
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 38c25fc45..2917be5ec 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -806,10 +806,12 @@ function comment_link($type, $node = 0, $main = 0) {
       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")) {
diff --git a/modules/node.module b/modules/node.module
index ed300212a..483cf564e 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -615,10 +615,12 @@ function node_link($type, $node = 0, $main = 0) {
 
     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')) {
diff --git a/modules/node/node.module b/modules/node/node.module
index ed300212a..483cf564e 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -615,10 +615,12 @@ function node_link($type, $node = 0, $main = 0) {
 
     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')) {
diff --git a/modules/user.module b/modules/user.module
index 52a396b07..68d25921a 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -453,9 +453,11 @@ function user_link($type) {
       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);
+      }
     }
   }
 }
diff --git a/modules/user/user.module b/modules/user/user.module
index 52a396b07..68d25921a 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -453,9 +453,11 @@ function user_link($type) {
       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);
+      }
     }
   }
 }