summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/watchdog.module10
-rw-r--r--modules/watchdog/watchdog.module10
2 files changed, 12 insertions, 8 deletions
diff --git a/modules/watchdog.module b/modules/watchdog.module
index 54b58c7ec..b0db2d3fd 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -52,11 +52,13 @@ function watchdog_perm() {
function watchdog_link($type) {
if ($type == "system") {
if (user_access("administer watchdog")) {
- menu("admin/watchdog", t("logs"), "watchdog_admin", 7);
- menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE);
+ if (arg(0) == 'admin') { // avoid SQL queries if possible
+ menu("admin/watchdog", t("logs"), "watchdog_admin", 7);
+ menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE);
- foreach (_watchdog_get_message_types() as $type) {
- menu("admin/watchdog/$type", t($type), "watchdog_admin");
+ foreach (_watchdog_get_message_types() as $type) {
+ menu("admin/watchdog/$type", t($type), "watchdog_admin");
+ }
}
}
}
diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module
index 54b58c7ec..b0db2d3fd 100644
--- a/modules/watchdog/watchdog.module
+++ b/modules/watchdog/watchdog.module
@@ -52,11 +52,13 @@ function watchdog_perm() {
function watchdog_link($type) {
if ($type == "system") {
if (user_access("administer watchdog")) {
- menu("admin/watchdog", t("logs"), "watchdog_admin", 7);
- menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE);
+ if (arg(0) == 'admin') { // avoid SQL queries if possible
+ menu("admin/watchdog", t("logs"), "watchdog_admin", 7);
+ menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE);
- foreach (_watchdog_get_message_types() as $type) {
- menu("admin/watchdog/$type", t($type), "watchdog_admin");
+ foreach (_watchdog_get_message_types() as $type) {
+ menu("admin/watchdog/$type", t($type), "watchdog_admin");
+ }
}
}
}