Merge pull request #13331 from annando/paging-search

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

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 17ac27cc3c01637dd010ef376c79824a8ec6f218..9028c9f853d13017b6854d0d9f2f5e99365313f4 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -95,8 +95,8 @@ class Item
                'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
                'quote-uri', 'quote-uri-id', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'mention', 'global',
                'author-id', 'author-link', 'author-alias', 'author-name', 'author-avatar', 'author-network', 'author-updated', 'author-gsid', 'author-addr', 'author-uri-id',
-               'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type', 'owner-updated',
-               'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network',
+               'owner-id', 'owner-link', 'owner-alias', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type', 'owner-updated',
+               'causer-id', 'causer-link', 'causer-alias', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network',
                'contact-id', 'contact-uid', 'contact-link', 'contact-name', 'contact-avatar',
                'writable', 'self', 'cid', 'alias',
                'event-created', 'event-edited', 'event-start', 'event-finish',
@@ -3138,7 +3138,7 @@ class Item
 
                if (!empty($quote_uri_id)) {
                        if (isset($shared_item['plink'])) {
-                               $item['body'] .= "\n" . DI::contentItem()->createSharedBlockByArray($shared_item);
+                               $item['body'] .= "\n" . DI::contentItem()->createSharedBlockByArray($shared_item, false, true);
                        } else {
                                DI::logger()->warning('Missing plink in shared item', ['item' => $item, 'shared' => $shared, 'quote_uri_id' => $quote_uri_id, 'shared_item' => $shared_item]);
                        }
@@ -3217,6 +3217,12 @@ class Item
                        $body = BBCode::removeSharedData($body);
                }
 
+               $pos = strpos($s, BBCode::SHARED_ANCHOR);
+               if ($pos) {
+                       $shared_html = substr($s, $pos + strlen(BBCode::SHARED_ANCHOR));
+                       $s = substr($s, 0, $pos);
+               }
+       
                $s = self::addGallery($s, $attachments, $item['uri-id']);
                $s = self::addVisualAttachments($attachments, $item, $s, false);
                $s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links);
@@ -3237,6 +3243,10 @@ class Item
                        $s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
                }
 
+               if (!empty($shared_html)) {
+                       $s .= $shared_html;
+               }
+
                $s = HTML::applyContentFilter($s, $filter_reasons);
 
                $hook_data = ['item' => $item, 'html' => $s];