Of all the patches to accidentally commit without a message. :( Rolling back registry rip. Let's try that again.

2 files changed, 21 insertions, 25 deletions

diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index ed9b79857..9623cc1e8 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -7,6 +7,20 @@
  */
 
 /**
+ * Implement hook_form_FORM_ID_alter().
+ */
+function dblog_form_system_logging_settings_alter(&$form, $form_state) {
+  $form['dblog_row_limit'] = array(
+    '#type' => 'select',
+    '#title' => t('Database log entries to keep'),
+    '#default_value' => variable_get('dblog_row_limit', 1000),
+    '#options' => drupal_map_assoc(array(100, 1000, 10000, 100000, 1000000)),
+    '#description' => t('The maximum number of entries to keep in the database log. Requires a <a href="@cron">cron maintenance task</a>.', array('@cron' => url('admin/reports/status')))
+  );
+  $form['buttons']['#weight'] = 1;
+}
+
+/**
  * Menu callback; displays a listing of log messages.
  */
 function dblog_overview() {
@@ -79,9 +93,9 @@ function dblog_overview() {
   }
 
   $build['dblog_table'] = array(
-    '#theme' => 'table',
-    '#header' => $header,
-    '#rows' => $rows,
+    '#theme' => 'table', 
+    '#header' => $header, 
+    '#rows' => $rows, 
     '#attributes' => array('id' => 'admin-dblog'),
   );
   $build['dblog_pager'] = array('#theme' => 'pager');
@@ -125,8 +139,8 @@ function dblog_top($type) {
   }
 
   $build['dblog_top_table']  = array(
-    '#theme' => 'table',
-    '#header' => $header,
+    '#theme' => 'table', 
+    '#header' => $header, 
     '#rows' => $rows,
   );
   $build['dblog_top_pager'] = array('#theme' => 'pager');
@@ -180,8 +194,8 @@ function dblog_event($id) {
       ),
     );
     $build['dblog_table'] = array(
-      '#theme' => 'table',
-      '#rows' => $rows,
+      '#theme' => 'table', 
+      '#rows' => $rows, 
       '#attributes' => array('class' => array('dblog-event')),
     );
     return $build;
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module
index 28f7d2f43..761d76acf 100644
--- a/modules/dblog/dblog.module
+++ b/modules/dblog/dblog.module
@@ -48,7 +48,6 @@ function dblog_menu() {
     'page callback' => 'dblog_overview',
     'access arguments' => array('access site reports'),
     'weight' => -1,
-    'file' => 'dblog.admin.inc',
   );
   $items['admin/reports/page-not-found'] = array(
     'title' => "Top 'page not found' errors",
@@ -56,7 +55,6 @@ function dblog_menu() {
     'page callback' => 'dblog_top',
     'page arguments' => array('page not found'),
     'access arguments' => array('access site reports'),
-    'file' => 'dblog.admin.inc',
   );
   $items['admin/reports/access-denied'] = array(
     'title' => "Top 'access denied' errors",
@@ -64,7 +62,6 @@ function dblog_menu() {
     'page callback' => 'dblog_top',
     'page arguments' => array('access denied'),
     'access arguments' => array('access site reports'),
-    'file' => 'dblog.admin.inc',
   );
   $items['admin/reports/event/%'] = array(
     'title' => 'Details',
@@ -72,7 +69,6 @@ function dblog_menu() {
     'page arguments' => array(3),
     'access arguments' => array('access site reports'),
     'type' => MENU_CALLBACK,
-    'file' => 'dblog.admin.inc',
   );
   return $items;
 }
@@ -153,20 +149,6 @@ function dblog_watchdog(array $log_entry) {
 }
 
 /**
- * Implement hook_form_FORM_ID_alter().
- */
-function dblog_form_system_logging_settings_alter(&$form, $form_state) {
-  $form['dblog_row_limit'] = array(
-    '#type' => 'select',
-    '#title' => t('Database log entries to keep'),
-    '#default_value' => variable_get('dblog_row_limit', 1000),
-    '#options' => drupal_map_assoc(array(100, 1000, 10000, 100000, 1000000)),
-    '#description' => t('The maximum number of entries to keep in the database log. Requires a <a href="@cron">cron maintenance task</a>.', array('@cron' => url('admin/reports/status')))
-  );
-  $form['buttons']['#weight'] = 1;
-}
-
-/**
  * Theme dblog administration filter selector.
  *
  * @ingroup themeable