aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/formatter
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-11-03 12:38:38 +0100
committerArthurHoaro <arthur@hoa.ro>2020-11-03 12:43:35 +0100
commit740b32b520e6b1723512c6f9b78cef6575b1725b (patch)
tree01d976a30db84d4aa3cd2c0e6a429cc5ac15a187 /application/formatter
parent38b55fbf3d4fdb515d0e82e5a3126d4671652b3e (diff)
downloadShaarli-740b32b520e6b1723512c6f9b78cef6575b1725b.tar.gz
Shaarli-740b32b520e6b1723512c6f9b78cef6575b1725b.tar.zst
Shaarli-740b32b520e6b1723512c6f9b78cef6575b1725b.zip
Default formatter: add a setting to disable auto-linkification
+ update documentation + single parameter for both URL and hashtags Fixes #1094
Diffstat (limited to 'application/formatter')
-rw-r--r--application/formatter/BookmarkDefaultFormatter.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/application/formatter/BookmarkDefaultFormatter.php b/application/formatter/BookmarkDefaultFormatter.php
index d58a5e39..149a3eb9 100644
--- a/application/formatter/BookmarkDefaultFormatter.php
+++ b/application/formatter/BookmarkDefaultFormatter.php
@@ -46,8 +46,13 @@ class BookmarkDefaultFormatter extends BookmarkFormatter
46 $bookmark->getDescription() ?? '', 46 $bookmark->getDescription() ?? '',
47 $bookmark->getAdditionalContentEntry('search_highlight')['description'] ?? [] 47 $bookmark->getAdditionalContentEntry('search_highlight')['description'] ?? []
48 ); 48 );
49 $description = format_description(
50 escape($description),
51 $indexUrl,
52 $this->conf->get('formatter_settings.autolink', true)
53 );
49 54
50 return $this->replaceTokens(format_description(escape($description), $indexUrl)); 55 return $this->replaceTokens($description);
51 } 56 }
52 57
53 /** 58 /**