hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'

Browse source 
common api: fix newlines in markdown code blocks

See merge request pleroma/pleroma!651
This commit is contained in:
Haelwenn 2019-01-10 03:54:29 +00:00
commit ab4c5f5bf7
2 changed files with 50 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/common_api/utils.ex
View file

@ -136,7 +136,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def format_input(text, mentions, _tags, "text/html") do
text
|> Formatter.html_escape("text/html")
|> String.replace(~r/\r?\n/, "<br>")
|> (&{[], &1}).()
|> Formatter.add_user_links(mentions)
|> Formatter.finalize()
@ -150,7 +149,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> Formatter.mentions_escape(mentions)
|> Earmark.as_html!()
|> Formatter.html_escape("text/html")
|> String.replace(~r/\r?\n/, "")
|> (&{[], &1}).()
|> Formatter.add_user_links(mentions)
|> Formatter.add_hashtag_links(tags)