From 1cfdbfdf527072ed0b4a4328323211a1dcab7f4a Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 4 May 2010 12:16:34 +0200
Subject: [PATCH] Cast Horde_Url to string.

---
 framework/Rpc/lib/Horde/Rpc/Jsonrpc.php | 2 +-
 framework/Rpc/lib/Horde/Rpc/Phpgw.php   | 2 +-
 framework/Rpc/lib/Horde/Rpc/Soap.php    | 4 ++--
 framework/Rpc/lib/Horde/Rpc/Xmlrpc.php  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/Rpc/lib/Horde/Rpc/Jsonrpc.php b/framework/Rpc/lib/Horde/Rpc/Jsonrpc.php
index c5d170319..3686981e7 100644
--- a/framework/Rpc/lib/Horde/Rpc/Jsonrpc.php
+++ b/framework/Rpc/lib/Horde/Rpc/Jsonrpc.php
@@ -177,7 +177,7 @@ class Horde_Rpc_Jsonrpc extends Horde_Rpc
         }
 
         /*@TODO Use Horde_Http_Request */
-        $http = new HTTP_Request($url, $options);
+        $http = new HTTP_Request((string)$url, $options);
         if (!empty($language)) {
             $http->addHeader('Accept-Language', $language);
         }
diff --git a/framework/Rpc/lib/Horde/Rpc/Phpgw.php b/framework/Rpc/lib/Horde/Rpc/Phpgw.php
index 85da702db..ac1bcc541 100644
--- a/framework/Rpc/lib/Horde/Rpc/Phpgw.php
+++ b/framework/Rpc/lib/Horde/Rpc/Phpgw.php
@@ -142,7 +142,7 @@ class Horde_Rpc_Phpgw extends Horde_Rpc
             $options = array_merge($options, $GLOBALS['conf']['http']['proxy']);
         }
 
-        $http = new HTTP_Request($url, $options);
+        $http = new HTTP_Request((string)$url, $options);
         if (!empty($language)) {
             $http->addHeader('Accept-Language', $language);
         }
diff --git a/framework/Rpc/lib/Horde/Rpc/Soap.php b/framework/Rpc/lib/Horde/Rpc/Soap.php
index 904ec54c8..1c5aeb201 100644
--- a/framework/Rpc/lib/Horde/Rpc/Soap.php
+++ b/framework/Rpc/lib/Horde/Rpc/Soap.php
@@ -62,7 +62,7 @@ class Horde_Rpc_Soap extends Horde_Rpc
             $this->_serviceName = $params['serviceName'];
         }
 
-        $this->_server = new SoapServer(null, array('uri' => Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/rpc.php', true, -1)));
+        $this->_server = new SoapServer(null, array('uri' => (string)Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/rpc.php', true, -1)));
         $this->_server->addFunction(SOAP_FUNCTIONS_ALL);
         $this->_server->setClass('Horde_Rpc_Soap_Caller', $params);
     }
@@ -146,7 +146,7 @@ class Horde_Rpc_Soap extends Horde_Rpc
             $options['password'] = $options['pass'];
             unset($options['pass']);
         }
-        $options['location'] = $url;
+        $options['location'] = (string)$url;
         $options['uri'] = $options['namespace'];
 
         $soap = new SoapClient(null, $options);
diff --git a/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php b/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php
index 3105c2757..fe4a0fe37 100644
--- a/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php
+++ b/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php
@@ -121,7 +121,7 @@ class Horde_Rpc_Xmlrpc extends Horde_Rpc
         }
 
         /*@TODO Use Horde_Http_Request */
-        $http = new HTTP_Request($url, $options);
+        $http = new HTTP_Request((string)$url, $options);
         if (!empty($language)) {
             $http->addHeader('Accept-Language', $language);
         }
-- 
2.11.0