diff options
| author | feld <feld@feld.me> | 2021-05-04 13:29:14 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-05-04 13:29:14 +0000 |
| commit | d5263bfcf37cb1f6190d0848c6b417d33d8fb979 (patch) | |
| tree | d6884f389f87a483efbbaf571da97260eebd0337 /lib/pleroma/web/common_api/utils.ex | |
| parent | 377f84f3678f9c2541fbd4a200cd93c5ab0dea24 (diff) | |
| parent | dca87c5e7b4b12918cf59a83a77be389a7e0df01 (diff) | |
| download | pleroma-d5263bfcf37cb1f6190d0848c6b417d33d8fb979.tar.gz | |
Merge branch 'earmark' into 'develop'
Upgrade Earmark to v1.4.15
Closes #1942 and #2026
See merge request pleroma/pleroma!3076
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 4e6a3feb0..94a378e11 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -286,7 +286,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do def format_input(text, "text/markdown", options) do text |> Formatter.mentions_escape(options) - |> Earmark.as_html!(%Earmark.Options{renderer: Pleroma.EarmarkRenderer}) + |> Formatter.markdown_to_html() |> Formatter.linkify(options) |> Formatter.html_escape("text/html") end |