diff options
| author | Zach Copley <zach@status.net> | 2010-03-01 21:54:53 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-01 21:54:53 -0800 |
| commit | 82c9714fca86edcfa3a54274f8fb1caadb355deb (patch) | |
| tree | d9f33792bb1047b40eaadb720e643cb28a90f265 /plugins/OStatus/classes/Ostatus_profile.php | |
| parent | 871b3aa6c00b38e1782949e201e5cbca7fb7a524 (diff) | |
| parent | 680ace19665f064404ddb4723d9b41ab69c6e1bd (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
High-priority OStatus fixes:
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
Diffstat (limited to 'plugins/OStatus/classes/Ostatus_profile.php')
| -rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 93e8934c9..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 { |