Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.802
diff -u -p -r1.802 common.inc
--- includes/common.inc	9 Oct 2008 01:49:03 -0000	1.802
+++ includes/common.inc	9 Oct 2008 20:25:56 -0000
@@ -588,6 +588,7 @@ function drupal_http_request($url, $head
  * Error levels:
  * - 0 = Log errors to database.
  * - 1 = Log errors to database and to screen.
+ * - 2 = Log PHP notices also.
  */
 function drupal_error_handler($errno, $message, $filename, $line, $context) {
   // If the @ error suppression operator was used, error_reporting will have
@@ -621,7 +622,8 @@ function drupal_error_handler($errno, $m
     $entry = $types[$errno] . ': ' . $message . ' in ' . $filename . ' on line ' . $line . '.';
 
     // Force display of error messages in update.php.
-    if (variable_get('error_level', 1) == 1 || strstr($_SERVER['SCRIPT_NAME'], 'update.php')) {
+    $error_level = variable_get('error_level', 2);
+    if ($error_level >= 2 || ($error_level == 1 && ($errno & (E_ALL ^ E_NOTICE))) || strstr($_SERVER['SCRIPT_NAME'], 'update.php') ) {
       drupal_set_message($entry, 'error');
     }
 
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.95
diff -u -p -r1.95 system.admin.inc
--- modules/system/system.admin.inc	9 Oct 2008 00:02:29 -0000	1.95
+++ modules/system/system.admin.inc	9 Oct 2008 20:26:36 -0000
@@ -1305,8 +1305,14 @@ function system_error_reporting_settings
   );
 
   $form['error_level'] = array(
-    '#type' => 'select', '#title' => t('Error reporting'), '#default_value' => variable_get('error_level', 1),
-    '#options' => array(t('Write errors to the log'), t('Write errors to the log and to the screen')),
+    '#type' => 'select',
+    '#title' => t('Error reporting'),
+    '#default_value' => variable_get('error_level', 2),
+    '#options' => array(
+      0 => t('Site in production: Write errors to the log. Write PHP notices to the log.'),
+      1 => t('Site in development: Write errors to the log and to the screen. Write PHP notices to the log.'),
+      2 => t('For developers: Write errors to the log and to the screen. Write PHP notices to the log and to the screen.'),
+    ),
     '#description' => t('Specify where Drupal, PHP and SQL errors are logged. While it is recommended that a site running in a production environment write errors to the log only, in a development or testing environment it may be helpful to write errors both to the log and to the screen.')
   );