From f246dd4645c8e2312b722c7eca05714ed867f0a9 Mon Sep 17 00:00:00 2001 From: Joshua Judson Rosen Date: Tue, 30 Dec 2014 23:56:33 -0500 Subject: [PATCH] OStatusPlugin: fix ensureProfile catch-22 in onCheckActivityAuthorship() Use profile URL (not URI), like elsewhere. Profile::getUri() doesn't actually do anything useful, here-- it does nothing unless a plugin (like OStatus) is already able to resolve the Profile into a backend object (e.g.: an Ostatus_profile). If we might not already have an Ostatus_profile for a given Profile, then we need to use $profile->getUrl() and fetch the data from that URL. --- plugins/OStatus/OStatusPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 07523cdd0b..46c49c5f55 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -1342,7 +1342,7 @@ class OStatusPlugin extends Plugin static public function onCheckActivityAuthorship(Activity $activity, Profile &$profile) { try { - $oprofile = Ostatus_profile::ensureProfileURI($profile->getUri()); + $oprofile = Ostatus_profile::ensureProfileURL($profile->getUrl()); $profile = $oprofile->checkAuthorship($activity); } catch (Exception $e) { common_log(LOG_ERR, 'Could not get a profile or check authorship ('.get_class($e).': "'.$e->getMessage().'") for activity ID: '.$activity->id);