? .DS_Store
? clean_url_settings_12-423196.patch
? clean_url_settings_13.patch
? dblog_cleanup_01.patch
? dblog_cleanup_02.patch
? node_machine_name_00.patch
? node_machine_name_01.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: modules/dblog/dblog.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 dblog.admin.inc
--- modules/dblog/dblog.admin.inc	13 Mar 2009 14:28:18 -0000	1.14
+++ modules/dblog/dblog.admin.inc	6 Apr 2009 15:01:34 -0000
@@ -7,21 +7,19 @@
  */
 
 /**
- * dblog module settings form.
- *
- * @ingroup forms
- * @see system_settings_form()
+ * Implementation of hook_form_alter().
  */
-function dblog_admin_settings() {
-  $form['dblog_row_limit'] = array(
-    '#type' => 'select',
-    '#title' => t('Discard log entries above the following row limit'),
-    '#default_value' => 1000,
-    '#options' => drupal_map_assoc(array(100, 1000, 10000, 100000, 1000000)),
-    '#description' => t('The maximum number of rows to keep in the database log. Older entries will be automatically discarded. (Requires a correctly configured <a href="@cron">cron maintenance task</a>.)', array('@cron' => url('admin/reports/status')))
-  );
-
-  return system_settings_form($form, TRUE);
+function dblog_form_alter(&$form, $form_state, $form_id) {
+  if ($form_id == 'system_logging_settings') {
+    $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;
+  }
 }
 
 /**
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.36
diff -u -p -r1.36 dblog.module
--- modules/dblog/dblog.module	13 Mar 2009 14:28:18 -0000	1.36
+++ modules/dblog/dblog.module	6 Apr 2009 15:01:34 -0000
@@ -42,14 +42,6 @@ function dblog_theme() {
  * Implementation of hook_menu().
  */
 function dblog_menu() {
-  $items['admin/settings/logging/dblog'] = array(
-    'title' => 'Database logging',
-    'description' => 'Settings for logging to the Drupal database logs. This is the most common method for small to medium sites on shared hosting. The logs are viewable from the admin pages.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('dblog_admin_settings'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_LOCAL_TASK,
-  );
   $items['admin/reports/dblog'] = array(
     'title' => 'Recent log entries',
     'description' => 'View events that have recently been logged.',