Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / lib / Shorturl_api.php

diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index ef0d8dda4526a174fb89df01310b06107bb3e535..de4d550127c0c5221b7f465206474a12b398755b 100644 (file)
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -43,15 +43,16 @@ abstract class ShortUrlApi
 
     protected function http_post($data)
     {
-        $request = new HTTPClient($this->service_url);
-        return $request->post($data);
+        $request = HTTPClient::start();
+        $response = $request->post($this->service_url, null, $data);
+        return $response->getBody();
     }
 
     protected function http_get($url)
     {
-        $service = $this->service_url . urlencode($url);
-        $request = new HTTPClient($service);
-        return $request->get();
+        $request = HTTPClient::start();
+        $response = $request->get($this->service_url . urlencode($url));
+        return $response->getBody();
     }
 
     protected function tidy($response) {