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

Conflicts:
	lib/router.php

1 files changed, 5 insertions, 1 deletions

diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index 93a35b3f3..b4f80a50a 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -118,7 +118,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
         $params = http_build_query(array(
             'login' => $this->getLogin(),
             'apiKey' => $this->getApiKey()), '', '&');
-        $serviceUrl = sprintf($this->serviceUrl, $url) . '&' . $params;
+        $serviceUrl = sprintf($this->serviceUrl, urlencode($url)) . '&' . $params;
 
         $request = HTTPClient::start();
         return $request->get($serviceUrl);
@@ -145,6 +145,10 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
             common_log(LOG_INFO, $body);
             $json = json_decode($body, true);
             if ($json['statusCode'] == 'OK') {
+                if (!isset($json['results'][$url])) {
+                    common_log(LOG_ERR, "bit.ly returned OK response, but didn't find expected URL $url in $body");
+                    return false;
+                }
                 $data = $json['results'][$url];
                 if (isset($data['shortUrl'])) {
                     return true;