diff options
| -rw-r--r-- | modules/watchdog.module | 12 | ||||
| -rw-r--r-- | modules/watchdog/watchdog.module | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/modules/watchdog.module b/modules/watchdog.module index 1ffd7376c..7531f6c13 100644 --- a/modules/watchdog.module +++ b/modules/watchdog.module @@ -32,22 +32,15 @@ function watchdog_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/logs', 'title' => t('logs'), - 'callback' => 'watchdog_overview', 'access' => user_access('administer watchdog')); + 'callback' => 'watchdog_overview'); $items[] = array('path' => 'admin/logs/event', 'title' => t('details'), - 'callback' => 'watchdog_event', 'access' => user_access('administer watchdog'), + 'callback' => 'watchdog_event', 'type' => MENU_CALLBACK); } return $items; } /** - * Implementation of hook_perm(). - */ -function watchdog_perm() { - return array('administer watchdog'); -} - -/** * Implementation of hook_cron(). * * Remove expired log messages and flood control events. @@ -87,6 +80,7 @@ function watchdog_overview() { '#options' => $names, '#default_value' => $_SESSION['watchdog_overview_filter'] ); + $form['#action'] = 'admin/logs'; $form['submit'] = array('#type' => 'submit', '#value' =>t('Filter')); $output = drupal_get_form('watchdog_form_overview', $form); diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 1ffd7376c..7531f6c13 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -32,22 +32,15 @@ function watchdog_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/logs', 'title' => t('logs'), - 'callback' => 'watchdog_overview', 'access' => user_access('administer watchdog')); + 'callback' => 'watchdog_overview'); $items[] = array('path' => 'admin/logs/event', 'title' => t('details'), - 'callback' => 'watchdog_event', 'access' => user_access('administer watchdog'), + 'callback' => 'watchdog_event', 'type' => MENU_CALLBACK); } return $items; } /** - * Implementation of hook_perm(). - */ -function watchdog_perm() { - return array('administer watchdog'); -} - -/** * Implementation of hook_cron(). * * Remove expired log messages and flood control events. @@ -87,6 +80,7 @@ function watchdog_overview() { '#options' => $names, '#default_value' => $_SESSION['watchdog_overview_filter'] ); + $form['#action'] = 'admin/logs'; $form['submit'] = array('#type' => 'submit', '#value' =>t('Filter')); $output = drupal_get_form('watchdog_form_overview', $form); |