Merge branch 'work' into testing

2010-03-01 16:57:58 -08:00
parent 45e8819c1b 493b5479c1
commit e30af99873
4 changed files with 52 additions and 18 deletions
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -698,7 +698,7 @@ class Ostatus_profile extends Memcached_DataObject
    {
        // Get the canonical feed URI and check it
        $discover = new FeedDiscovery();
-        if ($hints['feedurl']) {
+        if (isset($hints['feedurl'])) {
            $feeduri = $hints['feedurl'];
            $feeduri = $discover->discoverFromFeedURL($feeduri);
        } else {