aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-01-10 03:45:58 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-01-10 03:45:58 +0000
commit0bdbd4f968b20a508f9433480c7e358428dc55d7 (patch)
tree0c0c2c73dad13b682f3727b6ba03863f258cda60 /lib
parent2ecf81f10c1ebc01d21b4183f6cd248ce5cfbd6a (diff)
downloadpleroma-0bdbd4f968b20a508f9433480c7e358428dc55d7.tar.gz
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
ok @lanodan
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/common_api/utils.ex1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 187e908ce..7e30d224c 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -136,7 +136,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def format_input(text, mentions, _tags, "text/html") do
text
|> Formatter.html_escape("text/html")
- |> String.replace(~r/\r?\n/, "<br>")
|> (&{[], &1}).()
|> Formatter.add_user_links(mentions)
|> Formatter.finalize()