diff options
| author | feld <feld@feld.me> | 2020-02-05 20:32:45 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-02-05 20:32:45 +0000 |
| commit | b21e59da5f69505d276ddfa6b00c67a838dcc149 (patch) | |
| tree | fa87f427eaf9a606cc5f44cf13850f229db2a8d1 /lib | |
| parent | 49e80a15377fe460d7ac644601609700fffea632 (diff) | |
| parent | 3909b5b7b34bbf879fd7809eef6ec0ae286c2ef2 (diff) | |
| download | pleroma-b21e59da5f69505d276ddfa6b00c67a838dcc149.tar.gz | |
Merge branch 'remove-linker-scheme-option' into 'develop'
Remove AutoLinker `scheme` option from the config
See merge request pleroma/pleroma!2176
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 19b9af46c..90895374d 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -13,7 +13,8 @@ defmodule Pleroma.Formatter do @auto_linker_config hashtag: true, hashtag_handler: &Pleroma.Formatter.hashtag_handler/4, mention: true, - mention_handler: &Pleroma.Formatter.mention_handler/4 + mention_handler: &Pleroma.Formatter.mention_handler/4, + scheme: true def escape_mention_handler("@" <> nickname = mention, buffer, _, _) do case User.get_cached_by_nickname(nickname) do |