diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-19 07:41:09 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-19 07:41:09 +0000 |
| commit | e4da81d6629e138d5e1519c081d44a9ed0481ac7 (patch) | |
| tree | 3957a24efa14131f99792ba553c0f15cf83b6369 | |
| parent | b586ead6b815897e1993c4977aeafa0338a3945b (diff) | |
| parent | ee6f15529d0bf0404452bb8ae54f878f54881d5d (diff) | |
| download | pleroma-e4da81d6629e138d5e1519c081d44a9ed0481ac7.tar.gz pleroma-e4da81d6629e138d5e1519c081d44a9ed0481ac7.zip | |
Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
CommonAPI post: kill \r with fire
See merge request pleroma/pleroma!120
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 49c4ee1eb..3c092d524 100644 --- 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 |