Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.611.2.3
diff -u -Ftion -r1.611.2.3 common.inc
--- includes/common.inc	23 Mar 2007 20:49:11 -0000	1.611.2.3
+++ includes/common.inc	27 Mar 2007 12:00:24 -0000
@@ -535,7 +535,7 @@       $result->redirect_url = $location;
  *  0 = Log errors to database.
  *  1 = Log errors to database and to screen.
  */
-function error_handler($errno, $message, $filename, $line) {
+function drupal_error_handler($errno, $message, $filename, $line) {
   // If the @ error suppression operator was used, error_reporting is temporarily set to 0
   if (error_reporting() == 0) {
     return;
@@ -1834,7 +1834,7 @@ function _drupal_bootstrap_full() {
   require_once './includes/image.inc';
   require_once './includes/form.inc';
   // Set the Drupal custom error handler.
-  set_error_handler('error_handler');
+  set_error_handler('drupal_error_handler');
   // Emit the correct charset HTTP header.
   drupal_set_header('Content-Type: text/html; charset=utf-8');
   // Detect string handling method