Fix some remote subscription regressions from f21f78364a
Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
This commit is contained in:
parent
bbfb766885
commit
f1b3d84b7d
|
@ -290,7 +290,7 @@ class OStatusPlugin extends Plugin
|
|||
$url = "$scheme://$target";
|
||||
$this->log(LOG_INFO, "Checking profile address '$url'");
|
||||
try {
|
||||
$oprofile = Ostatus_profile::ensureProfile($url);
|
||||
$oprofile = Ostatus_profile::ensureProfileURL($url);
|
||||
if ($oprofile && !$oprofile->isGroup()) {
|
||||
$profile = $oprofile->localProfile();
|
||||
$matches[$pos] = array('mentioned' => array($profile),
|
||||
|
@ -392,7 +392,7 @@ class OStatusPlugin extends Plugin
|
|||
|
||||
foreach ($urls as $url) {
|
||||
try {
|
||||
return Ostatus_profile::ensureProfile($url);
|
||||
return Ostatus_profile::ensureProfileURL($url);
|
||||
} catch (Exception $e) {
|
||||
common_log(LOG_ERR, 'Profile lookup failed for ' .
|
||||
$arg . ': ' . $e->getMessage());
|
||||
|
|
|
@ -1464,7 +1464,7 @@ class Ostatus_profile extends Memcached_DataObject
|
|||
if (array_key_exists('profileurl', $hints)) {
|
||||
try {
|
||||
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);
|
||||
return $oprofile;
|
||||
} catch (Exception $e) {
|
||||
|
|
|
@ -103,7 +103,7 @@ function updateOStatus($user)
|
|||
echo "Checking {$rp->nickname}...";
|
||||
}
|
||||
|
||||
$op = Ostatus_profile::ensureProfile($rp->profileurl);
|
||||
$op = Ostatus_profile::ensureProfileURL($rp->profileurl);
|
||||
|
||||
if (empty($op)) {
|
||||
echo "can't convert.\n";
|
||||
|
|
Loading…
Reference in New Issue
Block a user