GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
This commit is contained in:
Brion Vibber
2010-12-16 15:56:19 -08:00
parent bf20258f4b f901c25012
commit e79034e163
1104 changed files with 24017 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -1514,8 +1514,11 @@ class Ostatus_profile extends Managed_DataObject
}
// Try the profile url (like foo.example.com or example.com/user/foo)
$profileUrl = ($object->link) ? $object->link : $hints['profileurl'];
if (!empty($object->link)) {
$profileUrl = $object->link;
} else if (!empty($hints['profileurl'])) {
$profileUrl = $hints['profileurl'];
}
if (!empty($profileUrl)) {
$nickname = self::nicknameFromURI($profileUrl);
@@ -1546,9 +1549,11 @@ class Ostatus_profile extends Managed_DataObject
protected static function nicknameFromURI($uri)
{
preg_match('/(\w+):/', $uri, $matches);
$protocol = $matches[1];
if (preg_match('/(\w+):/', $uri, $matches)) {
$protocol = $matches[1];
} else {
return null;
}
switch ($protocol) {
case 'acct':