mirror of
https://github.com/friendica/friendica
synced 2024-11-09 16:22:56 +00:00
Merge pull request #11981 from annando/better-quote
Quote of quotes are visually improved
This commit is contained in:
commit
0b0567081a
2 changed files with 3 additions and 3 deletions
|
@ -22,7 +22,7 @@
|
|||
namespace Friendica\Content;
|
||||
|
||||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Content\Text\Markdown;
|
||||
use Friendica\Content\Text\HTML;
|
||||
use Friendica\Core\Hook;
|
||||
use Friendica\Core\L10n;
|
||||
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 (Diaspora::isReshare($item['body'], false)) {
|
||||
$item['body'] = Markdown::toBBCode(BBCode::toMarkdown($item['body']));
|
||||
$item['body'] = Diaspora::replacePeopleGuid($item['body'], $item['author-link']);
|
||||
$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
|
||||
}
|
||||
|
||||
$shared_content .= $item['body'] . '[/share]';
|
||||
|
|
|
@ -2395,6 +2395,7 @@ class Diaspora
|
|||
$datarray = self::setDirection($datarray, $direction);
|
||||
|
||||
$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
|
||||
Tag::storeFromBody($datarray['uri-id'], $datarray['body']);
|
||||
|
|
Loading…
Reference in a new issue