diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-13 18:22:55 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-13 18:22:55 +0000 |
| commit | 3e0f05f08e1aea082fbd0fcaf4a444fe15469b02 (patch) | |
| tree | baffd27c907855c340e18ea1362811d57d008b26 /lib/pleroma/web/common_api/utils.ex | |
| parent | 096c5c52e0eda931e3a9c46b61292dde55e19c91 (diff) | |
| parent | d1379c4de8ca27fa6d02d20a0029b248efe1d09e (diff) | |
| download | pleroma-3e0f05f08e1aea082fbd0fcaf4a444fe15469b02.tar.gz | |
Merge branch 'bugfix/br-vs-newline' into 'develop'
Formatting: Do not use \n and prefer <br> instead
Closes #1374 and #1375
See merge request pleroma/pleroma!2204
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 348fdedf1..635e7cd38 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -331,7 +331,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do def format_input(text, "text/markdown", options) do text |> Formatter.mentions_escape(options) - |> Earmark.as_html!() + |> Earmark.as_html!(%Earmark.Options{renderer: Pleroma.EarmarkRenderer}) |> Formatter.linkify(options) |> Formatter.html_escape("text/html") end |