diff --git a/lib/activity.php b/lib/activity.php index 9dbb0e2ee0..5234a54c03 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -570,18 +570,6 @@ class Activity if ($author) { $this->actor->outputTo($xs, 'author'); - - // XXX: Remove ASAP! Author information - // has been moved to the author element in the Activity - // Streams spec. We're outputting actor only for backward - // compatibility with clients that can only parse - // activities based on older versions of the spec. - - $depMsg = 'Deprecation warning: activity:actor is present ' - . 'only for backward compatibility. It will be ' - . 'removed in the next version of StatusNet.'; - $xs->comment($depMsg); - $this->actor->outputTo($xs, 'activity:actor'); } if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') { diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php index b3c3817858..5801c194a6 100644 --- a/plugins/Activity/ActivityPlugin.php +++ b/plugins/Activity/ActivityPlugin.php @@ -374,7 +374,8 @@ class ActivityPlugin extends Plugin if (!empty($fave)) { $notice = Notice::staticGet('id', $fave->notice_id); if (!empty($notice)) { - $target = $notice->asActivity(); + $cur = common_current_user(); + $target = $notice->asActivity($cur); if ($target->verb == ActivityVerb::POST) { // "I like the thing you posted" $activity->objects = $target->objects;