Merge remote-tracking branch 'upstream/develop' into loop-prevention

[friendica.git] / src / Protocol / Feed.php

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index f137bd2349dda50fefd313b31ef23cc1f83c88e8..c155e9e3d250b326074ccac8236a08d1b97fe0cc 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -1109,7 +1109,7 @@ class Feed
 
                $body = OStatus::formatPicturePost($item['body'], $item['uri-id']);
 
-               $body = BBCode::convert($body, false, BBCode::OSTATUS);
+               $body = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
 
                XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
 
@@ -1186,7 +1186,7 @@ class Feed
        private static function getTitle(array $item)
        {
                if ($item['title'] != '') {
-                       return BBCode::convert($item['title'], false, BBCode::OSTATUS);
+                       return BBCode::convertForUriId($item['uri-id'], $item['title'], BBCode::ACTIVITYPUB);
                }
 
                // Fetch information about the post