Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
CommonAPI post: kill \r with fire See merge request pleroma/pleroma!120
This commit is contained in:
commit
e4da81d662
1 changed files with 1 additions and 0 deletions
|
@ -61,6 +61,7 @@ def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
|
|||
|
||||
def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
|
||||
status
|
||||
|> String.replace("\r", "")
|
||||
|> format_input(mentions, tags)
|
||||
|> maybe_add_attachments(attachments, no_attachment_links)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue