Merge pull request #12512 from annando/available

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index fa928110539a4a72d86cebafa4b68575c9177f7d..112c36a9c836bc67b4ff21657552d12d046f6c8a 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3016,7 +3016,11 @@ class Item
                $item['hashtags'] = $tags['hashtags'];
                $item['mentions'] = $tags['mentions'];
 
-               $body = $item['body'] = Post\Media::removeFromEndOfBody($item['body'] ?? '');
+               if (!$is_preview) {
+                       $item['body'] = Post\Media::removeFromEndOfBody($item['body'] ?? '');
+               }
+
+               $body = $item['body'];
 
                $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id', 'post-type'];
 
@@ -3026,6 +3030,7 @@ class Item
                $shared = DI::contentItem()->getSharedPost($item, $fields);
                if (!empty($shared['post'])) {
                        $shared_item  = $shared['post'];
+                       $shared_item['body'] = Post\Media::removeFromEndOfBody($shared_item['body']);
                        $quote_uri_id = $shared['post']['uri-id'];
                        $shared_links[] = strtolower($shared['post']['uri']);
                        $item['body'] = BBCode::removeSharedData($item['body']);
@@ -3331,15 +3336,15 @@ class Item
                }
 
                if ($shared) {
-                       $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . BBCode::TOP_ANCHOR, $content);
-                       $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>' . BBCode::BOTTOM_ANCHOR, $content);
+                       $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '</div>' . BBCode::TOP_ANCHOR, $content);
+                       $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '</div>' . BBCode::BOTTOM_ANCHOR, $content);
                } else {
                        if ($leading != '') {
-                               $content = '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . $content;
+                               $content = '<div class="body-attach">' . $leading . '</div>' . $content;
                        }
 
                        if ($trailing != '') {
-                               $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+                               $content .= '<div class="body-attach">' . $trailing . '</div>';
                        }
                }
 
@@ -3499,7 +3504,7 @@ class Item
                }
 
                if ($trailing != '') {
-                       $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+                       $content .= '<div class="body-attach">' . $trailing . '</div>';
                }
 
                DI::profiler()->stopRecording();