aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <git.pleroma.social@hacktivis.me>2018-09-28 19:20:54 +0000
committerHaelwenn <git.pleroma.social@hacktivis.me>2018-09-28 19:20:54 +0000
commitab2e5ba989720932bacf0b6c6db5dc27e762a9bb (patch)
treed9ecd88a8bf0adc60180e4c6e266153cb47a7f98 /lib
parent34b6d444d61c40afe34e06980ab3566884504a2b (diff)
parenta3cffd3566495edfe823b75142524717d0b64b24 (diff)
downloadpleroma-ab2e5ba989720932bacf0b6c6db5dc27e762a9bb.tar.gz
Merge branch 'bugfix/magnet-links' into 'develop'
formatter: Stop using phoenix HTML and format it ourselves Closes #307 See merge request pleroma/pleroma!363
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/formatter.ex8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 62f54a3f2..d5565a2ca 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -222,13 +222,7 @@ defmodule Pleroma.Formatter do
subs =
subs ++
Enum.map(links, fn {uuid, url} ->
- {:safe, link} = Phoenix.HTML.Link.link(url, to: url)
-
- link =
- link
- |> IO.iodata_to_binary()
-
- {uuid, link}
+ {uuid, "<a href=\"#{url}\">#{url}</a>"}
end)
{subs, uuid_text}