wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only set ->actor in a case where it has not yet been set

Browse Source 
Otherwise it could overwrite it with the wrong actor (the "second round"
for share activities)
This commit is contained in:
Mikael Nordfeldth 2015-10-14 01:18:28 +02:00
parent d260808cd3
commit 401b774c2f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Share/SharePlugin.php
View File

@ -156,7 +156,6 @@ class SharePlugin extends ActivityVerbHandlerPlugin
{ {
// TODO: How to handle repeats of deleted notices? // TODO: How to handle repeats of deleted notices?
$target = Notice::getByID($stored->repeat_of); $target = Notice::getByID($stored->repeat_of);
$act->actor = $target->getProfile()->asActivityObject();
// TRANS: A repeat activity's title. %1$s is repeater's nickname // TRANS: A repeat activity's title. %1$s is repeater's nickname
// and %2$s is the repeated user's nickname. // and %2$s is the repeated user's nickname.
$act->title = sprintf(_('%1$s repeated a notice by %2$s'), $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 // Repeat is a little bit special. As it's an activity, our
// ActivityObject is instead turned into an Activity // ActivityObject is instead turned into an Activity
$object = new Activity(); $object = new Activity();
$object->actor = $stored->getProfile()->asActivityObject();
$object->verb = ActivityVerb::SHARE; $object->verb = ActivityVerb::SHARE;
$object->content = $stored->rendered; $object->content = $stored->rendered;
$this->extendActivity($stored, $object); $this->extendActivity($stored, $object);