diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-01-10 03:54:29 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-01-10 03:54:29 +0000 |
| commit | ab4c5f5bf72a2400465c725cec40e61ab754c9be (patch) | |
| tree | d3c028beabcb6e6d5bcc59947a00a098dc70ab6a /lib | |
| parent | 7f5efddd6ed60fead5b456186b67a96dde95e6b9 (diff) | |
| parent | 490c80bc9651f93b61dfe4ae531bc0072a35d044 (diff) | |
| download | pleroma-ab4c5f5bf72a2400465c725cec40e61ab754c9be.tar.gz | |
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 3ff9f9452..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() @@ -150,7 +149,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do |> Formatter.mentions_escape(mentions) |> Earmark.as_html!() |> Formatter.html_escape("text/html") - |> String.replace(~r/\r?\n/, "") |> (&{[], &1}).() |> Formatter.add_user_links(mentions) |> Formatter.add_hashtag_links(tags) |