From c63992027b083369228cab933dc9830675c0685b Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sun, 31 Aug 2008 12:50:45 +0000
Subject: #297860 by catch: Reverting reversion to reverted DBTNG stuff. Tests
 should pass now.

---
 includes/xmlrpc.inc | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'includes/xmlrpc.inc')

diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index 28b160b24..4895e9802 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -342,7 +342,7 @@ EOD;
 }
 
 
-function xmlrpc_error($code = NULL, $message = NULL, $reset = FALSE) {
+function xmlrpc_error($code = NULL, $message = NULL) {
   static $xmlrpc_error;
   if (isset($code)) {
     $xmlrpc_error = new stdClass();
@@ -351,9 +351,6 @@ function xmlrpc_error($code = NULL, $message = NULL, $reset = FALSE) {
     $xmlrpc_error->message = $message;
     module_invoke('system', 'check_http_request');
   }
-  elseif ($reset) {
-    $xmlrpc_error = NULL;
-  }
   return $xmlrpc_error;
 }
 
@@ -430,7 +427,6 @@ function xmlrpc_base64_get_xml($xmlrpc_base64) {
 function _xmlrpc() {
   $args = func_get_args();
   $url = array_shift($args);
-  xmlrpc_clear_error();
   if (is_array($args[0])) {
     $method = 'system.multicall';
     $multicall_args = array();
@@ -479,10 +475,3 @@ function xmlrpc_error_msg() {
   $error = xmlrpc_error();
   return ($error != NULL ? $error->message : NULL);
 }
-
-/**
- * Clears any previous error.
- */
-function xmlrpc_clear_error() {
-  xmlrpc_error(NULL, NULL, TRUE);
-}
\ No newline at end of file
-- 
cgit v1.2.3