? modules/simpletest/tests/343502.test
? modules/simpletest/tests/343502.test.txt
? sites/all/modules
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.851
diff -u -p -r1.851 common.inc
--- includes/common.inc	20 Jan 2009 00:47:47 -0000	1.851
+++ includes/common.inc	20 Jan 2009 00:53:11 -0000
@@ -798,8 +798,9 @@ function _drupal_log_error($error, $fata
   }
 
   // Force display of error messages in update.php or if the proper error
-  // reporting level is set.
-  $error_level = variable_get('error_level', 2);
+  // reporting level is set. If this is a development release, default to
+  // showing all errors, including PHP notices.
+  $error_level = variable_get('error_level', defined('VERSION') && strpos('dev', VERSION) !== FALSE ? 2 : 1);
   if ($error_level == 2 || ($error_level == 1 && $error['%type'] != 'Notice') || (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'update')) {
     drupal_set_message(t('%type: %message in %function (line %line of %file).', $error), 'error');
   }
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.32
diff -u -p -r1.32 dblog.module
--- modules/dblog/dblog.module	8 Jan 2009 08:42:12 -0000	1.32
+++ modules/dblog/dblog.module	20 Jan 2009 00:53:11 -0000
@@ -48,6 +48,7 @@ function dblog_menu() {
     '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',
Index: modules/syslog/syslog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.module,v
retrieving revision 1.20
diff -u -p -r1.20 syslog.module
--- modules/syslog/syslog.module	11 Jan 2009 21:19:18 -0000	1.20
+++ modules/syslog/syslog.module	20 Jan 2009 00:53:11 -0000
@@ -28,11 +28,12 @@ function syslog_help($path, $arg) {
 
 function syslog_menu() {
   $items['admin/settings/logging/syslog'] = array(
-    'title'          => 'Syslog',
-    'description'    => 'Settings for syslog logging. Syslog is an operating system administrative logging tool used in systems management and security auditing. Most suited to medium and large sites, syslog provides filtering tools that allow messages to be routed by type and severity.',
-    'page callback'  => 'drupal_get_form',
+    'title' => 'Syslog logging',
+    'description' => 'Settings for syslog logging. Syslog is an operating system administrative logging tool used in systems management and security auditing. Most suited to medium and large sites, syslog provides filtering tools that allow messages to be routed by type and severity.',
+    'page callback' => 'drupal_get_form',
     'page arguments' => array('syslog_admin_settings'),
     'access arguments' => array('administer site configuration'),
+    'type' => MENU_LOCAL_TASK,
   );
   return $items;
 }
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.119
diff -u -p -r1.119 system.admin.inc
--- modules/system/system.admin.inc	19 Jan 2009 21:13:09 -0000	1.119
+++ modules/system/system.admin.inc	20 Jan 2009 00:53:15 -0000
@@ -1225,9 +1225,25 @@ function system_site_information_setting
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
     '#required' => TRUE,
   );
+  $form['site_403'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Default 403 (access denied) page'),
+    '#default_value' => '',
+    '#size' => 40,
+    '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'),
+    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
+  );
+  $form['site_404'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Default 404 (not found) page'),
+    '#default_value' => '',
+    '#size' => 40,
+    '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'),
+    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
+  );
   $form['#validate'][] = 'system_site_information_settings_validate';
 
-  return system_settings_form($form, TRUE);
+  return system_settings_form($form);
 }
 
 /**
@@ -1256,27 +1272,11 @@ function system_site_information_setting
  * @ingroup forms
  * @see system_settings_form()
  */
-function system_error_reporting_settings() {
-  $form['site_403'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Default 403 (access denied) page'),
-    '#default_value' => '',
-    '#size' => 40,
-    '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'),
-    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
-  );
-  $form['site_404'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Default 404 (not found) page'),
-    '#default_value' => '',
-    '#size' => 40,
-    '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'),
-    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
-  );
+function system_logging_settings() {
   $form['error_level'] = array(
     '#type' => 'radios',
     '#title' => t('Error reporting'),
-    '#default_value' => 2,
+    '#default_value' => strpos('dev', VERSION) !== FALSE ? 2 : 1,
     '#options' => array(
       0 => t('Site in production: do not display any errors.'),
       1 => t('Site in development: display functional errors only.'),
@@ -1289,18 +1289,6 @@ function system_error_reporting_settings
 }
 
 /**
- * Menu callback; Menu page for the various logging options.
- */
-function system_logging_overview() {
-  $item = menu_get_item('admin/settings/logging');
-  $content = system_admin_menu_block($item);
-
-  $output = theme('admin_block_content', $content);
-
-  return $output;
-}
-
-/**
  * Form builder; Configure site performance settings.
  *
  * @ingroup forms
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.659
diff -u -p -r1.659 system.module
--- modules/system/system.module	14 Jan 2009 21:13:41 -0000	1.659
+++ modules/system/system.module	20 Jan 2009 00:53:16 -0000
@@ -586,18 +586,18 @@ function system_menu() {
     'page arguments' => array('system_site_information_settings'),
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/settings/error-reporting'] = array(
-    'title' => 'Error reporting',
-    'description' => 'Control how Drupal deals with errors including 403/404 errors as well as PHP error reporting.',
+  $items['admin/settings/logging'] = array(
+    'title' => 'Logging, errors and alerts',
+    'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destination, such as syslog, database, email, ...etc.",
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('system_error_reporting_settings'),
+    'page arguments' => array('system_logging_settings'),
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/settings/logging'] = array(
-    'title' => 'Logging and alerts',
-    'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destination, such as syslog, database, email, ...etc.",
-    'page callback' => 'system_logging_overview',
+  $items['admin/settings/logging/settings'] = array(
+    'title' => 'Settings',
     'access arguments' => array('administer site configuration'),
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -1,
   );
   $items['admin/settings/performance'] = array(
     'title' => 'Performance',
@@ -1298,7 +1298,7 @@ function _system_settings_form_automatic
       $form[$key] = _system_settings_form_automatic_defaults($form[$key]);
     }
   }
-  
+
   return $form;
 }
 
@@ -1319,7 +1319,7 @@ function system_settings_form($form, $au
   if ($automatic_defaults) {
     $form = _system_settings_form_automatic_defaults($form);
   }
-  
+
   if (!empty($_POST) && form_get_errors()) {
     drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
   }
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.36
diff -u -p -r1.36 system.test
--- modules/system/system.test	14 Jan 2009 12:18:37 -0000	1.36
+++ modules/system/system.test	20 Jan 2009 00:53:17 -0000
@@ -450,7 +450,7 @@ class AccessDeniedTestCase extends Drupa
     $node = $this->drupalCreateNode($edit);
 
     // Use a custom 403 page.
-    $this->drupalPost('admin/settings/error-reporting', array('site_403' => 'node/' . $node->nid), t('Save configuration'));
+    $this->drupalPost('admin/settings/site-information', array('site_403' => 'node/' . $node->nid), t('Save configuration'));
 
     $this->drupalGet('admin');
     $this->assertText($node->title, t('Found the custom 403 page'));
@@ -464,7 +464,7 @@ class AccessDeniedTestCase extends Drupa
 
     // Log back in and remove the custom 403 page.
     $this->drupalLogin($this->admin_user);
-    $this->drupalPost('admin/settings/error-reporting', array(), t('Reset to defaults'));
+    $this->drupalPost('admin/settings/site-information', array(), t('Reset to defaults'));
 
     // Logout and check that the user login block is shown on default 403 pages.
     $this->drupalLogout();
@@ -511,7 +511,7 @@ class PageNotFoundTestCase extends Drupa
     $node = $this->drupalCreateNode($edit);
 
     // Use a custom 404 page.
-    $this->drupalPost('admin/settings/error-reporting', array('site_404' => 'node/' . $node->nid), t('Save configuration'));
+    $this->drupalPost('admin/settings/site-information', array('site_404' => 'node/' . $node->nid), t('Save configuration'));
 
     $this->drupalGet($this->randomName(10));
     $this->assertText($node->title, t('Found the custom 404 page'));
@@ -525,7 +525,7 @@ class PageNotFoundTestCase extends Drupa
 
     // Log back in and remove the custom 404 page.
     $this->drupalLogin($this->admin_user);
-    $this->drupalPost('admin/settings/error-reporting', array(), t('Reset to defaults'));
+    $this->drupalPost('admin/settings/site-information', array(), t('Reset to defaults'));
 
     // Logout and check that the user login block is not shown on default 404 pages.
     $this->drupalLogout();
@@ -778,16 +778,16 @@ class SystemSettingsForm extends DrupalW
   function tearDown() {
     variable_del('system_settings_form_test');
     variable_del('system_settings_form_test_4');
-    
+
     parent::tearDown();
   }
-  
+
   /**
    * Tests the handling of automatic defaults in systems_settings_form().
    */
   function testAutomaticDefaults() {
     $form = array();
-    
+
     $form['system_settings_form_test'] = array(
       '#type' => 'checkbox',
       '#default_value' => FALSE,
@@ -819,7 +819,6 @@ class SystemSettingsForm extends DrupalW
     $this->assertTrue($automatic['system_settings_form_test_3']['#default_value']);
     $this->assertFalse($automatic['has_children']['system_settings_form_test_4']['#default_value']);
     $this->assertTrue($automatic['has_children']['system_settings_form_test_5']['#default_value']);
-    
 
     $no_automatic = system_settings_form($form);
     $this->assertTrue($no_automatic['system_settings_form_test']['#default_value']);