diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2018-09-02 00:14:25 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-10-05 20:49:34 +0000 |
| commit | b1be9415effadf81e557eddee3f60bdf0fa359af (patch) | |
| tree | b307cd06e023c68977f39736fc8aaecf89a9bc5f /lib/pleroma/formatter.ex | |
| parent | f7ba393bb94f29bb79bc34ff3c708f929f61cc57 (diff) | |
| download | pleroma-b1be9415effadf81e557eddee3f60bdf0fa359af.tar.gz | |
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe04ca6073a322bcf77239e7d4b79839, reversing
changes made to 340ab3cb9068d444b77213e07beb8c2c3ca128b9.
Diffstat (limited to 'lib/pleroma/formatter.ex')
| -rw-r--r-- | lib/pleroma/formatter.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index d5565a2ca..c0a176184 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -192,7 +192,11 @@ defmodule Pleroma.Formatter do ] # TODO: make it use something other than @link_regex - def html_escape(text) do + def html_escape(text, "text/html") do + HtmlSanitizeEx.basic_html(text) + end + + def html_escape(text, "text/plain") do Regex.split(@link_regex, text, include_captures: true) |> Enum.map_every(2, fn chunk -> {:safe, part} = Phoenix.HTML.html_escape(chunk) |