Merge pull request #11989 from annando/quote-again

Only add images for non-federated quote shares

diff --git a/src/Content/Item.php b/src/Content/Item.php
index d1cdbc679b7ab36dbe4889816eb068eeb2986ecf..1bf8410cd4356d2a64b52d4714ee607c1d4d17df 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -657,7 +657,9 @@ class Item
        public function createSharedBlockByArray(array $item): string
        {
                if (!in_array($item['network'] ?? '', Protocol::FEDERATED)) {
+                       $item['guid'] = '';
                        $item['uri']  = '';
+                       $item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
                }
 
                $shared_content = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid'], $item['uri']);
@@ -668,8 +670,6 @@ class Item
 
                $shared = BBCode::fetchShareAttributes($item['body']);
 
-               $item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body'], [Post\Media::IMAGE]);
-
                // If it is a reshared post then reformat it to avoid display problems with two share elements
                if (Diaspora::isReshare($item['body'], false)) {
                        if (!empty($shared['guid']) && ($encaspulated_share = self::createSharedPostByGuid($shared['guid']))) {