clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11981 from annando/better-quote 

Quote of quotes are visually improved
This commit is contained in:
Hypolite Petovan 2022-10-10 09:46:47 -04:00 committed by GitHub
parent c8406f6cd0 028de0e228
commit 0b0567081a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Content/Item.php
View File

@ -22,7 +22,7 @@
namespace Friendica\Content; namespace Friendica\Content;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown; use Friendica\Content\Text\HTML;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Logger; use Friendica\Core\Logger;
@ -669,8 +669,7 @@ class Item
// If it is a reshared post then reformat it to avoid display problems with two share elements // If it is a reshared post then reformat it to avoid display problems with two share elements
if (Diaspora::isReshare($item['body'], false)) { if (Diaspora::isReshare($item['body'], false)) {
$item['body'] = Markdown::toBBCode(BBCode::toMarkdown($item['body'])); $item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
$item['body'] = Diaspora::replacePeopleGuid($item['body'], $item['author-link']);
} }
$shared_content .= $item['body'] . '[/share]'; $shared_content .= $item['body'] . '[/share]';

1
src/Protocol/Diaspora.php
View File

@ -2395,6 +2395,7 @@ class Diaspora
$datarray = self::setDirection($datarray, $direction); $datarray = self::setDirection($datarray, $direction);
$datarray['body'] = DI::contentItem()->createSharedPostByGuid($root_guid, $importer['uid'], $original_person['url']); $datarray['body'] = DI::contentItem()->createSharedPostByGuid($root_guid, $importer['uid'], $original_person['url']);
$datarray['body'] = Diaspora::replacePeopleGuid($datarray['body'], $datarray['author-link']);
/// @todo Copy tag data from original post /// @todo Copy tag data from original post
Tag::storeFromBody($datarray['uri-id'], $datarray['body']); Tag::storeFromBody($datarray['uri-id'], $datarray['body']);