Merge commit 'refs/merge-requests/28' of https://gitorious.org/social/mainline into merge-requests/28

This commit is contained in:
Mikael Nordfeldth 2015-01-08 16:48:42 +01:00
commit d32fef6039

View File

@ -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);