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

Fix some remote subscription regressions from f21f78364a

Browse Source 
Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
This commit is contained in:
Brion Vibber 2010-03-18 13:13:57 -07:00
parent bbfb766885
commit f1b3d84b7d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/OStatusPlugin.php
View File

@ -290,7 +290,7 @@ class OStatusPlugin extends Plugin
$url = "$scheme://$target"; $url = "$scheme://$target";
$this->log(LOG_INFO, "Checking profile address '$url'"); $this->log(LOG_INFO, "Checking profile address '$url'");
try { try {
$oprofile = Ostatus_profile::ensureProfile($url); $oprofile = Ostatus_profile::ensureProfileURL($url);
if ($oprofile && !$oprofile->isGroup()) { if ($oprofile && !$oprofile->isGroup()) {
$profile = $oprofile->localProfile(); $profile = $oprofile->localProfile();
$matches[$pos] = array('mentioned' => array($profile), $matches[$pos] = array('mentioned' => array($profile),
@ -392,7 +392,7 @@ class OStatusPlugin extends Plugin
foreach ($urls as $url) { foreach ($urls as $url) {
try { try {
return Ostatus_profile::ensureProfile($url); return Ostatus_profile::ensureProfileURL($url);
} catch (Exception $e) { } catch (Exception $e) {
common_log(LOG_ERR, 'Profile lookup failed for ' . common_log(LOG_ERR, 'Profile lookup failed for ' .
$arg . ': ' . $e->getMessage()); $arg . ': ' . $e->getMessage());

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

@ -1464,7 +1464,7 @@ class Ostatus_profile extends Memcached_DataObject
if (array_key_exists('profileurl', $hints)) { if (array_key_exists('profileurl', $hints)) {
try { try {
common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl"); common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl");
$oprofile = self::ensureProfile($hints['profileurl'], $hints); $oprofile = self::ensureProfileURL($hints['profileurl'], $hints);
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri); self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
return $oprofile; return $oprofile;
} catch (Exception $e) { } catch (Exception $e) {

2
plugins/OStatus/scripts/updateostatus.php
View File

@ -103,7 +103,7 @@ function updateOStatus($user)
echo "Checking {$rp->nickname}..."; echo "Checking {$rp->nickname}...";
} }
$op = Ostatus_profile::ensureProfile($rp->profileurl); $op = Ostatus_profile::ensureProfileURL($rp->profileurl);
if (empty($op)) { if (empty($op)) {
echo "can't convert.\n"; echo "can't convert.\n";