diff options
Diffstat (limited to 'modules')
32 files changed, 48 insertions, 56 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module index 5241489ad..fd7b8e2dd 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -110,7 +110,7 @@ function import_link($type) { menu("admin/node/syndication/news/help", t("help"), "import_help_page", 9); } if (user_access("access news feeds")) { - menu("import", t("news feeds"), "import_page", 0, 1); + menu("import", t("news feeds"), "import_page", 0, MENU_HIDE); } } diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 5241489ad..fd7b8e2dd 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -110,7 +110,7 @@ function import_link($type) { menu("admin/node/syndication/news/help", t("help"), "import_help_page", 9); } if (user_access("access news feeds")) { - menu("import", t("news feeds"), "import_page", 0, 1); + menu("import", t("news feeds"), "import_page", 0, MENU_HIDE); } } diff --git a/modules/archive.module b/modules/archive.module index f915e1884..59fe4a6ff 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -190,7 +190,7 @@ function archive_link($type) { if ($type == "system") { if (user_access("access content")) { - menu("archive", t("archives"), "archive_page", 0, 1); + menu("archive", t("archives"), "archive_page", 0, MENU_HIDE); } } diff --git a/modules/archive/archive.module b/modules/archive/archive.module index f915e1884..59fe4a6ff 100644 --- a/modules/archive/archive.module +++ b/modules/archive/archive.module @@ -190,7 +190,7 @@ function archive_link($type) { if ($type == "system") { if (user_access("access content")) { - menu("archive", t("archives"), "archive_page", 0, 1); + menu("archive", t("archives"), "archive_page", 0, MENU_HIDE); } } diff --git a/modules/blog.module b/modules/blog.module index 3eef09394..e24f7cb97 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -253,7 +253,7 @@ function blog_link($type, $node = 0, $main) { menu("blog/" . $user->uid, t("my blog"), "blog_page", 1); } if (user_access("access content")) { - menu("blog", t("blogs"), "blog_page", 0, 1); + menu("blog", t("blogs"), "blog_page", 0, MENU_HIDE); } } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 3eef09394..e24f7cb97 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -253,7 +253,7 @@ function blog_link($type, $node = 0, $main) { menu("blog/" . $user->uid, t("my blog"), "blog_page", 1); } if (user_access("access content")) { - menu("blog", t("blogs"), "blog_page", 0, 1); + menu("blog", t("blogs"), "blog_page", 0, MENU_HIDE); } } diff --git a/modules/book.module b/modules/book.module index d27fe6054..3d8c3c5fd 100644 --- a/modules/book.module +++ b/modules/book.module @@ -84,7 +84,7 @@ function book_link($type, $node = 0, $main = 0) { } } if (user_access("access content")) { - menu("book", t("books"), "book_page", 0, 1); + menu("book", t("books"), "book_page", 0, MENU_HIDE); } } diff --git a/modules/book/book.module b/modules/book/book.module index d27fe6054..3d8c3c5fd 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -84,7 +84,7 @@ function book_link($type, $node = 0, $main = 0) { } } if (user_access("access content")) { - menu("book", t("books"), "book_page", 0, 1); + menu("book", t("books"), "book_page", 0, MENU_HIDE); } } diff --git a/modules/comment.module b/modules/comment.module index de4073b88..4a5192365 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -842,7 +842,7 @@ function comment_link($type, $node = 0, $main = 0) { 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, 1); + menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, MENU_HIDE); // comment settings: if (user_access("administer moderation")) { @@ -853,7 +853,7 @@ function comment_link($type, $node = 0, $main = 0) { menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", 6); } } - menu("comment", t("comments"), "comment_page", 0, 1); + menu("comment", t("comments"), "comment_page", 0, MENU_HIDE); } return $links; diff --git a/modules/comment/comment.module b/modules/comment/comment.module index de4073b88..4a5192365 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -842,7 +842,7 @@ function comment_link($type, $node = 0, $main = 0) { 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, 1); + menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, MENU_HIDE); // comment settings: if (user_access("administer moderation")) { @@ -853,7 +853,7 @@ function comment_link($type, $node = 0, $main = 0) { menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", 6); } } - menu("comment", t("comments"), "comment_page", 0, 1); + menu("comment", t("comments"), "comment_page", 0, MENU_HIDE); } return $links; diff --git a/modules/drupal.module b/modules/drupal.module index 803112556..7926f18ce 100644 --- a/modules/drupal.module +++ b/modules/drupal.module @@ -157,7 +157,7 @@ function drupal_auth($username, $password, $server) { function drupal_link($type) { if ($type == "system") { - menu("drupal", "Drupal", "drupal_page", 0, 1); + menu("drupal", "Drupal", "drupal_page", 0, MENU_HIDE); } } diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index 803112556..7926f18ce 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -157,7 +157,7 @@ function drupal_auth($username, $password, $server) { function drupal_link($type) { if ($type == "system") { - menu("drupal", "Drupal", "drupal_page", 0, 1); + menu("drupal", "Drupal", "drupal_page", 0, MENU_HIDE); } } diff --git a/modules/forum.module b/modules/forum.module index a41ab0479..f88071178 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -104,7 +104,7 @@ function forum_link($type, $node = 0, $main = 0) { menu("node/add/forum", t("forum topic"), "node_page"); } if (user_access("access content")) { - menu("forum", t("forums"), "forum_page", 0, 1); + menu("forum", t("forums"), "forum_page", 0, MENU_HIDE); } } diff --git a/modules/forum/forum.module b/modules/forum/forum.module index a41ab0479..f88071178 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -104,7 +104,7 @@ function forum_link($type, $node = 0, $main = 0) { menu("node/add/forum", t("forum topic"), "node_page"); } if (user_access("access content")) { - menu("forum", t("forums"), "forum_page", 0, 1); + menu("forum", t("forums"), "forum_page", 0, MENU_HIDE); } } diff --git a/modules/import.module b/modules/import.module index 5241489ad..fd7b8e2dd 100644 --- a/modules/import.module +++ b/modules/import.module @@ -110,7 +110,7 @@ function import_link($type) { menu("admin/node/syndication/news/help", t("help"), "import_help_page", 9); } if (user_access("access news feeds")) { - menu("import", t("news feeds"), "import_page", 0, 1); + menu("import", t("news feeds"), "import_page", 0, MENU_HIDE); } } diff --git a/modules/locale.module b/modules/locale.module index 29c619798..ed9e89244 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -71,8 +71,8 @@ function locale_link($type) { menu("admin/locale", t("localization"), NULL, 5); menu("admin/locale/search", t("search string"), "locale_admin", 8); menu("admin/locale/help", t("help"), "locale_help_page", 9); - menu("admin/locale/edit", t("edit string"), "locale_admin", 0, 1); // hidden menu - menu("admin/locale/delete", t("delete string"), "locale_admin", 0, 1); // hidden menu + menu("admin/locale/edit", t("edit string"), "locale_admin", 0, MENU_HIDE); + menu("admin/locale/delete", t("delete string"), "locale_admin", 0, MENU_HIDE); foreach ($languages as $key => $value) { menu("admin/locale/$key", "$value", NULL); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 29c619798..ed9e89244 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -71,8 +71,8 @@ function locale_link($type) { menu("admin/locale", t("localization"), NULL, 5); menu("admin/locale/search", t("search string"), "locale_admin", 8); menu("admin/locale/help", t("help"), "locale_help_page", 9); - menu("admin/locale/edit", t("edit string"), "locale_admin", 0, 1); // hidden menu - menu("admin/locale/delete", t("delete string"), "locale_admin", 0, 1); // hidden menu + menu("admin/locale/edit", t("edit string"), "locale_admin", 0, MENU_HIDE); + menu("admin/locale/delete", t("delete string"), "locale_admin", 0, MENU_HIDE); foreach ($languages as $key => $value) { menu("admin/locale/$key", "$value", NULL); diff --git a/modules/node.module b/modules/node.module index 684f7dca7..680310226 100644 --- a/modules/node.module +++ b/modules/node.module @@ -581,12 +581,12 @@ function node_link($type, $node = 0, $main = 0) { 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, 1); + menu("admin/node/edit", t("edit post"), "node_admin", 0, MENU_HIDE); menu("admin/node/settings", t("settings"), "node_admin", 8); } if (user_access("access content")) { - menu("node", t("content"), "node_page", 0, 1); + menu("node", t("content"), "node_page", 0, MENU_HIDE); } } diff --git a/modules/node/node.module b/modules/node/node.module index 684f7dca7..680310226 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -581,12 +581,12 @@ function node_link($type, $node = 0, $main = 0) { 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, 1); + menu("admin/node/edit", t("edit post"), "node_admin", 0, MENU_HIDE); menu("admin/node/settings", t("settings"), "node_admin", 8); } if (user_access("access content")) { - menu("node", t("content"), "node_page", 0, 1); + menu("node", t("content"), "node_page", 0, MENU_HIDE); } } diff --git a/modules/poll.module b/modules/poll.module index b03db0c75..24819de44 100644 --- a/modules/poll.module +++ b/modules/poll.module @@ -185,7 +185,7 @@ function poll_link($type, $node = 0, $main) { menu("node/add/poll", t("poll"), "node_page", 0); } if (user_access("access content")) { - menu("poll", t("polls"), "poll_page", 0, 1); + menu("poll", t("polls"), "poll_page", 0, MENU_HIDE); } } else if ($type == "page" && user_access("access content")) { diff --git a/modules/poll/poll.module b/modules/poll/poll.module index b03db0c75..24819de44 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -185,7 +185,7 @@ function poll_link($type, $node = 0, $main) { menu("node/add/poll", t("poll"), "node_page", 0); } if (user_access("access content")) { - menu("poll", t("polls"), "poll_page", 0, 1); + menu("poll", t("polls"), "poll_page", 0, MENU_HIDE); } } else if ($type == "page" && user_access("access content")) { diff --git a/modules/search.module b/modules/search.module index f55f7eef3..2e2dc2544 100644 --- a/modules/search.module +++ b/modules/search.module @@ -43,7 +43,7 @@ function search_link($type) { } if ($type == "system" && user_access("search content")) { - menu("search", t("search"), "search_page", 0, 1); + menu("search", t("search"), "search_page", 0, MENU_HIDE); } return $links; diff --git a/modules/search/search.module b/modules/search/search.module index f55f7eef3..2e2dc2544 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -43,7 +43,7 @@ function search_link($type) { } if ($type == "system" && user_access("search content")) { - menu("search", t("search"), "search_page", 0, 1); + menu("search", t("search"), "search_page", 0, MENU_HIDE); } return $links; diff --git a/modules/statistics.module b/modules/statistics.module index 074c6ce4a..af69b8139 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -78,14 +78,14 @@ function statistics_link($type, $node = 0, $main = 0) { menu("admin/statistics/referrers/internal", t("internal referrers only"), "statistics_admin"); menu("admin/statistics/referrers/external", t("external referrers only"), "statistics_admin"); menu("admin/statistics/log", t("access log"), "statistics_admin"); - menu("admin/statistics/log/node", t("track node"), "statistics_admin", 0, 1); //hidden - menu("admin/statistics/log/user", t("track user"), "statistics_admin", 0, 1); //hidden - menu("admin/statistics/log/host", t("track host"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/log/node", t("track node"), "statistics_admin", 0, MENU_HIDE); + menu("admin/statistics/log/user", t("track user"), "statistics_admin", 0, MENU_HIDE); + menu("admin/statistics/log/host", t("track host"), "statistics_admin", 0, MENU_HIDE); menu("admin/statistics/help", t("help"), "statistics_help_page", 9); } if (user_access("access content")) { - menu("statistics", t("view most popular content"), "statistics_page", 0, 1); + menu("statistics", t("view most popular content"), "statistics_page", 0, MENU_HIDE); } } diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 074c6ce4a..af69b8139 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -78,14 +78,14 @@ function statistics_link($type, $node = 0, $main = 0) { menu("admin/statistics/referrers/internal", t("internal referrers only"), "statistics_admin"); menu("admin/statistics/referrers/external", t("external referrers only"), "statistics_admin"); menu("admin/statistics/log", t("access log"), "statistics_admin"); - menu("admin/statistics/log/node", t("track node"), "statistics_admin", 0, 1); //hidden - menu("admin/statistics/log/user", t("track user"), "statistics_admin", 0, 1); //hidden - menu("admin/statistics/log/host", t("track host"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/log/node", t("track node"), "statistics_admin", 0, MENU_HIDE); + menu("admin/statistics/log/user", t("track user"), "statistics_admin", 0, MENU_HIDE); + menu("admin/statistics/log/host", t("track host"), "statistics_admin", 0, MENU_HIDE); menu("admin/statistics/help", t("help"), "statistics_help_page", 9); } if (user_access("access content")) { - menu("statistics", t("view most popular content"), "statistics_page", 0, 1); + menu("statistics", t("view most popular content"), "statistics_page", 0, MENU_HIDE); } } diff --git a/modules/taxonomy.module b/modules/taxonomy.module index b63c2d7c7..b60fd1c89 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -29,7 +29,7 @@ function taxonomy_link($type, $node = NULL) { menu("admin/taxonomy/help", t("help"), "taxonomy_admin", 9); } if (user_access("access content")) { - menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, 1); + menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, MENU_HIDE); } } else if ($type == "taxonomy terms" && $node != NULL) { diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index b63c2d7c7..b60fd1c89 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -29,7 +29,7 @@ function taxonomy_link($type, $node = NULL) { menu("admin/taxonomy/help", t("help"), "taxonomy_admin", 9); } if (user_access("access content")) { - menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, 1); + menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, MENU_HIDE); } } else if ($type == "taxonomy terms" && $node != NULL) { diff --git a/modules/title.module b/modules/title.module index 4f9455ccc..e06fa36c0 100644 --- a/modules/title.module +++ b/modules/title.module @@ -16,7 +16,7 @@ function title_help($section) { function title_link($type) { if ($type == "system") { if (user_access("access content")) { - menu("title", t("search"), "title_page", 0, 1); + menu("title", t("search"), "title_page", 0, MENU_HIDE); } } } diff --git a/modules/user.module b/modules/user.module index 68ff3785d..5652de869 100644 --- a/modules/user.module +++ b/modules/user.module @@ -447,18 +447,16 @@ function theme_user_list($items, $title = NULL) { } function user_link($type) { - - $links = array(); + global $user; if ($type == "system") { - global $user; if ($user->uid) { menu("user", t("my account"), "user_page", 8); menu("user/edit", t("edit account"), "user_page", 0); menu("user/logout", t("log out"), "user_page", 10); } else { - menu("user", t("my account"), "user_page", 8, 1); + menu("user", t("my account"), "user_page", 8, MENU_HIDE); } if (user_access("administer users")) { @@ -471,11 +469,9 @@ function user_link($type) { 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, 1); // hidden menu + menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE); } } - - return $links; } /*** Authentication methods ************************************************/ diff --git a/modules/user/user.module b/modules/user/user.module index 68ff3785d..5652de869 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -447,18 +447,16 @@ function theme_user_list($items, $title = NULL) { } function user_link($type) { - - $links = array(); + global $user; if ($type == "system") { - global $user; if ($user->uid) { menu("user", t("my account"), "user_page", 8); menu("user/edit", t("edit account"), "user_page", 0); menu("user/logout", t("log out"), "user_page", 10); } else { - menu("user", t("my account"), "user_page", 8, 1); + menu("user", t("my account"), "user_page", 8, MENU_HIDE); } if (user_access("administer users")) { @@ -471,11 +469,9 @@ function user_link($type) { 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, 1); // hidden menu + menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE); } } - - return $links; } /*** Authentication methods ************************************************/ diff --git a/modules/watchdog.module b/modules/watchdog.module index 479b52cd2..2a6786d4d 100644 --- a/modules/watchdog.module +++ b/modules/watchdog.module @@ -56,7 +56,7 @@ function watchdog_link($type) { menu("admin/watchdog/warning", t("warning"), "watchdog_admin"); menu("admin/watchdog/error", t("error"), "watchdog_admin"); menu("admin/watchdog/httpd", t("httpd"), "watchdog_admin"); - menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, 1); // hidden menu + menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE); } } } diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 479b52cd2..2a6786d4d 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -56,7 +56,7 @@ function watchdog_link($type) { menu("admin/watchdog/warning", t("warning"), "watchdog_admin"); menu("admin/watchdog/error", t("error"), "watchdog_admin"); menu("admin/watchdog/httpd", t("httpd"), "watchdog_admin"); - menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, 1); // hidden menu + menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE); } } } |