diff options
author | Evan Prodromou <evan@status.net> | 2010-03-20 06:44:55 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-20 06:44:55 -0500 |
commit | c0f657200165faeb1ddd60230d0dc2ca2f404cb4 (patch) | |
tree | 024d909531dc6877f6e30e2fad1f720ebb0eecca /plugins/OStatus/lib | |
parent | 51283a1b34b52b22a17cd87f7b23ce384b7b6303 (diff) | |
parent | db0cf50f658a91d0d0a019256e6e85d73b7a3ff6 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/lib')
-rw-r--r-- | plugins/OStatus/lib/discoveryhints.php | 4 |
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; } |