From 401b774c2f6c43ddc76c1f373ee14da6a5c5cc3b Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Wed, 14 Oct 2015 01:18:28 +0200 Subject: [PATCH] Only set ->actor in a case where it has not yet been set Otherwise it could overwrite it with the wrong actor (the "second round" for share activities) --- plugins/Share/SharePlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php index 5b5d374abe..cfa93de7fa 100644 --- a/plugins/Share/SharePlugin.php +++ b/plugins/Share/SharePlugin.php @@ -156,7 +156,6 @@ class SharePlugin extends ActivityVerbHandlerPlugin { // TODO: How to handle repeats of deleted notices? $target = Notice::getByID($stored->repeat_of); - $act->actor = $target->getProfile()->asActivityObject(); // TRANS: A repeat activity's title. %1$s is repeater's nickname // and %2$s is the repeated user's nickname. $act->title = sprintf(_('%1$s repeated a notice by %2$s'), @@ -170,6 +169,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin // Repeat is a little bit special. As it's an activity, our // ActivityObject is instead turned into an Activity $object = new Activity(); + $object->actor = $stored->getProfile()->asActivityObject(); $object->verb = ActivityVerb::SHARE; $object->content = $stored->rendered; $this->extendActivity($stored, $object);