GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into 'master' 

Allow GNU social master code to receive Mastodon boosts

See merge request gnu/gnu-social!153
This commit is contained in:
mmn 2017-12-17 17:24:53 +00:00
parent 50f9f23ff1 a6e33bdd6a
commit 69bb81556f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/activity.php
View File

@ -180,7 +180,7 @@ class Activity
foreach ($objectEls as $objectEl) {
// Special case for embedded activities
$objectType = ActivityUtils::childContent($objectEl, self::OBJECTTYPE, self::SPEC);
if (!empty($objectType) && $objectType == ActivityObject::ACTIVITY) {
if ((!empty($objectType) && $objectType == ActivityObject::ACTIVITY) || $this->verb == ActivityVerb::SHARE) {
$this->objects[] = new Activity($objectEl);
} else {
$this->objects[] = new ActivityObject($objectEl);