diff options
| author | Zach Copley <zach@status.net> | 2010-02-25 16:07:32 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-25 16:07:32 -0800 |
| commit | 82cac2be595953029e61f2e6f21122206b82314e (patch) | |
| tree | 7412949e83096339d86bdb5e5f20e9229ff5c1c3 /plugins | |
| parent | 7922edb5b6c4ad55a1b81fa16c93e5656b676b26 (diff) | |
| parent | 45435a7c033d9c5acf0352bc44408667c5690198 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>")
Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 7026d82f2..5c082e5c6 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -1161,6 +1161,8 @@ class Ostatus_profile extends Memcached_DataObject $profile->profileurl = $object->link; } else if (array_key_exists('profileurl', $hints)) { $profile->profileurl = $hints['profileurl']; + } else if (Validate::uri($object->id, array('allowed_schemes' => array('http', 'https')))) { + $profile->profileurl = $object->id; } $profile->bio = self::getActivityObjectBio($object, $hints); |