summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-04-18 20:30:59 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-04-18 15:46:39 -0500
commitee6f15529d0bf0404452bb8ae54f878f54881d5d (patch)
tree3957a24efa14131f99792ba553c0f15cf83b6369
parentb586ead6b815897e1993c4977aeafa0338a3945b (diff)
downloadpleroma-ee6f15529d0bf0404452bb8ae54f878f54881d5d.tar.gz
pleroma-ee6f15529d0bf0404452bb8ae54f878f54881d5d.zip
CommonAPI post: kill \r with fire
-rw-r--r--lib/pleroma/web/common_api/utils.ex1
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