From: William Pitcock <nenolod@dereferenced.org>
Date: Wed, 18 Apr 2018 20:30:59 +0000 (+0000)
Subject: CommonAPI post: kill \r with fire
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ee6f15529d0bf0404452bb8ae54f878f54881d5d;p=akkoma

CommonAPI post: kill \r with fire
---

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