Index: modules/trace/trace.api.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/trace/trace.api.inc,v
retrieving revision 1.8
diff -u -Ftion -r1.8 trace.api.inc
--- modules/trace/trace.api.inc	16 Feb 2007 16:24:03 -0000	1.8
+++ modules/trace/trace.api.inc	27 Mar 2007 12:38:35 -0000
@@ -51,7 +51,7 @@   if (!empty($options[$type])) {
   }
 
   // Delegate to the standard Drupal error handler:
-  return error_handler($errno, $message, $filename, $line);
+  return drupal_error_handler($errno, $message, $filename, $line);
 }
 
 //////////////////////////////////////////////////////////////////////////////
Index: modules/onlinestatus/messengers.inc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/onlinestatus/messengers.inc.php,v
retrieving revision 1.11
diff -u -Ftion -r1.11 messengers.inc.php
--- modules/onlinestatus/messengers.inc.php	6 Nov 2006 00:38:35 -0000	1.11
+++ modules/onlinestatus/messengers.inc.php	27 Mar 2007 12:38:35 -0000
@@ -313,7 +313,7 @@     case 'description' :
       curl_setopt($ch, CURLOPT_HEADER, 0);
       curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
       if (curl_errno($ch)) {
-        error_handler(curl_errno($ch), curl_error($ch), __FILE__, __LINE__);
+        drupal_error_handler(curl_errno($ch), curl_error($ch), __FILE__, __LINE__);
       }
       $data = curl_exec($ch);
       curl_close($ch);
Index: modules/ride/ride.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ride/ride.module,v
retrieving revision 1.11
diff -u -Ftion -r1.11 ride.module
--- modules/ride/ride.module	1 Oct 2004 00:08:35 -0000	1.11
+++ modules/ride/ride.module	27 Mar 2007 12:39:36 -0000
@@ -1833,7 +1833,7 @@ function ride_error_handler($inNum, $inM
     $_ride_ErrLine, $_ride_ErrVars;
 
   // chain to Drupal's main error-handler for watchdog
-  error_handler($inNum, $inMessage, $inFile, $inLine, $inVars);
+  drupal_error_handler($inNum, $inMessage, $inFile, $inLine, $inVars);
 
   // set up our globals
   $_ride_ErrNum = $inNum;