diff options
| author | Zach Copley <zach@status.net> | 2010-03-02 07:33:18 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-02 07:33:18 +0000 |
| commit | 6c1321b108206d05b75703da22ea8abab82071bf (patch) | |
| tree | 7380e7eb3f0ab121ea25413ddf6f847c8915fc2c /plugins/OStatus/classes/Ostatus_profile.php | |
| parent | dbb9957eea1887265532dbae000fb1fc30005988 (diff) | |
| parent | 40e1b249cf1535a6074c8b32e5820c8ad6427836 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/classes/Ostatus_profile.php')
| -rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 7b1aec76b..a33e95d93 100644 --- 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 { @@ -1145,7 +1145,7 @@ class Ostatus_profile extends Memcached_DataObject if (!empty($poco)) { $url = $poco->getPrimaryURL(); - if ($url->type == 'homepage') { + if ($url && $url->type == 'homepage') { $homepage = $url->value; } } |