aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormmn <mmn@hethane.se>2017-12-17 17:24:53 +0000
committermmn <mmn@hethane.se>2017-12-17 17:24:53 +0000
commit69bb81556f21b5708ac76fef87ba9c0ec859097c (patch)
tree93cdb41f2cdb19ca2cbb6ea8b1f5a68d6cb2cc15
parent50f9f23ff19a4f577c429d80411378d6a1747725 (diff)
parenta6e33bdd6a9c44e5fd06af3c3973c0112792d743 (diff)
downloadgnu-social-69bb81556f21b5708ac76fef87ba9c0ec859097c.tar
gnu-social-69bb81556f21b5708ac76fef87ba9c0ec859097c.zip
Merge branch 'master' into 'master'
Allow GNU social master code to receive Mastodon boosts See merge request gnu/gnu-social!153
-rw-r--r--lib/activity.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/activity.php b/lib/activity.php
index 49f7603d80..a52f29e9ca 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -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);