pleroma

commit: e4da81d6629e138d5e1519c081d44a9ed0481ac7
parent: b586ead6b815897e1993c4977aeafa0338a3945b
Author: lambda <pleromagit@rogerbraun.net>
Date:   Thu, 19 Apr 2018 07:41:09 +0000

Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'

CommonAPI post: kill \r with fire

See merge request pleroma/pleroma!120
Diffstat:
M
lib/pleroma/web/common_api/utils.ex
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
@@ -61,6 +61,7 @@ defmodule Pleroma.Web.CommonAPI.Utils 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