Index: modules/onlinestatus/messengers.inc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/onlinestatus/messengers.inc.php,v
retrieving revision 1.6.2.1
diff -u -Ftion -r1.6.2.1 messengers.inc.php
--- modules/onlinestatus/messengers.inc.php	7 Nov 2006 00:00:59 -0000	1.6.2.1
+++ modules/onlinestatus/messengers.inc.php	27 Mar 2007 12:56:39 -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/trace/trace.api.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/trace/trace.api.inc,v
retrieving revision 1.3.2.2
diff -u -Ftion -r1.3.2.2 trace.api.inc
--- modules/trace/trace.api.inc	4 Dec 2006 23:08:28 -0000	1.3.2.2
+++ modules/trace/trace.api.inc	27 Mar 2007 12:56:40 -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);
 }
 
 //////////////////////////////////////////////////////////////////////////////