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

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index 9102788e6..80cfbbf15 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -102,7 +102,7 @@ class DiscoveryHints {
         if (array_key_exists('url', $hcard)) {
             if (is_string($hcard['url'])) {
                 $hints['homepage'] = $hcard['url'];
-            } else if (is_array($hcard['url'])) {
+            } else if (is_array($hcard['url']) && !empty($hcard['url'])) {
                 // HACK get the last one; that's how our hcards look
                 $hints['homepage'] = $hcard['url'][count($hcard['url'])-1];
             }
@@ -231,7 +231,7 @@ class DiscoveryHints {
 
         // If it's got a scheme, use it
 
-        if ($parts['scheme'] != '') {
+        if (!empty($parts['scheme'])) {
             return $rel;
         }