Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.352
diff -u -r1.352 common.inc
--- includes/common.inc	31 May 2004 09:40:54 -0000	1.352
+++ includes/common.inc	31 May 2004 22:07:41 -0000
@@ -441,12 +441,12 @@
 /* @} */
 
 function error_handler($errno, $message, $filename, $line, $variables) {
-  $types = array(1 => "error", 2 => "warning", 4 => "parse error", 8 => "notice", 16 => "core error", 32 => "core warning", 64 => "compile error", 128 => "compile warning", 256 => "user error", 512 => "user warning", 1024 => "user notice");
-  $entry = $types[$errno] .": $message in $filename on line $line.";
+  $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice');
+  $entry = "$types[$errno]: $message in $filename on line $line.";
 
   if ($errno & E_ALL ^ E_NOTICE) {
-    watchdog("error", $types[$errno] .": $message in $filename on line $line.");
-    if (error_reporting()) {
+    watchdog('error', "$types[$errno]: $message in $filename on line $line.");
+    if (ini_get('display_errors')) {
       print "<pre>$entry</pre>";
     }
   }