From 1495d04789239f78e06c7b4af4219f54be15eeaa Mon Sep 17 00:00:00 2001
From: ensra <ensra@users.noreply.github.com>
Date: Tue, 21 Aug 2018 14:51:27 +0100
Subject: [PATCH] fix test for converting bio \r\n to <br>.

---
 lib/pleroma/web/common_api/utils.ex | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index c7b0d7935..869f4c566 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -64,7 +64,6 @@ 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
@@ -95,7 +94,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   def format_input(text, mentions, tags) do
     text
     |> Formatter.html_escape()
-    |> String.replace("\n", "<br>")
+    |> String.replace(~r/\r?\n/, "<br>")
     |> (&{[], &1}).()
     |> Formatter.add_links()
     |> Formatter.add_user_links(mentions)
-- 
2.45.2