aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian <sen@tchnics.de>2017-08-25 11:35:02 +0000
committerSebastian <sen@tchnics.de>2017-08-25 11:35:02 +0000
commita6e33bdd6a9c44e5fd06af3c3973c0112792d743 (patch)
tree93cdb41f2cdb19ca2cbb6ea8b1f5a68d6cb2cc15
parent50f9f23ff19a4f577c429d80411378d6a1747725 (diff)
downloadgnu-social-a6e33bdd6a9c44e5fd06af3c3973c0112792d743.tar
gnu-social-a6e33bdd6a9c44e5fd06af3c3973c0112792d743.zip
Fixed code so that GNU social can receive Mastodon boosts (from GNU social nightly commit: https://git.gnu.io/gnu/gnu-social/commit/c741d1a52a8256336632d090fa5ffd7d2cf549a9)
-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);