Merge branch 'fix/linkify' into 'develop'

Fix links with HTML elements and/or parentheses. See merge request pleroma/pleroma!38
2017-12-08 12:34:03 +00:00 · 2017-12-08 12:34:03 +00:00 · 35cfbf43a0
commit 35cfbf43a0
parent 40c30ab895 a3e68f0233
3 changed files with 22 additions and 3 deletions
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@ -62,8 +62,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
  end

  def format_input(text, mentions, _tags) do
-    Phoenix.HTML.html_escape(text)
-    |> elem(1)
+    text
+    |> Formatter.html_escape
    |> Formatter.linkify
    |> String.replace("\n", "<br>")
    |> add_user_links(mentions)