Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.787
diff -u -p -r1.787 common.inc
--- includes/common.inc	17 Aug 2008 11:08:23 -0000	1.787
+++ includes/common.inc	21 Aug 2008 16:00:32 -0000
@@ -620,10 +620,10 @@ function drupal_error_handler($errno, $m
 
     // Force display of error messages in update.php.
     if (variable_get('error_level', 1) == 1 || strstr($_SERVER['SCRIPT_NAME'], 'update.php')) {
-      drupal_set_message($entry, 'error');
+      drupal_set_message($entry, (E_NOTICE ? 'warning' : 'error'));
     }
 
-    watchdog('php', '%message in %file on line %line.', array('%error' => $types[$errno], '%message' => $message, '%file' => $filename, '%line' => $line), WATCHDOG_ERROR);
+    watchdog('php', '%message in %file on line %line.', array('%error' => $types[$errno], '%message' => $message, '%file' => $filename, '%line' => $line), (E_NOTICE ? WATCHDOG_WARNING : WATCHDOG_ERROR));
   }
 }