summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-10-18 01:20:00 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-10-18 01:20:00 +0000
commite3ea311cd594d4f0bc8c4e05ca8eb1eee18ae6be (patch)
tree135d421546e79dfc5b62943f7cb11d57d20f190f /lib
parent340c8812963a71f5f04b12a4c540bad3871f87fd (diff)
parentdf0b56576a6863db9f1ca2c7987f2a465bd1f1c3 (diff)
downloadpleroma-e3ea311cd594d4f0bc8c4e05ca8eb1eee18ae6be.tar.gz
pleroma-e3ea311cd594d4f0bc8c4e05ca8eb1eee18ae6be.zip
Merge branch 'tusooa/2810-punycode-mention' into 'develop'
Fix mentioning punycode domains when using Markdown Closes #2810 See merge request pleroma/pleroma!3925
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/formatter.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index a46c3e381..11d5af2fb 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -124,7 +124,7 @@ defmodule Pleroma.Formatter do
end
def markdown_to_html(text) do
- Earmark.as_html!(text, %Earmark.Options{compact_output: true})
+ Earmark.as_html!(text, %Earmark.Options{compact_output: true, smartypants: false})
end
def html_escape({text, mentions, hashtags}, type) do