diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-11-05 16:47:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-05 16:47:17 +0100 |
commit | 8bbf57a2d0dfe8d8d6416a26f9ff1177c77e806b (patch) | |
tree | 8b2ff8ff1eabb2370ccf5931409f697e7d6f004f /application/formatter | |
parent | 47d15818502b11315b484131aaf67a3e3f441c5a (diff) | |
parent | 740b32b520e6b1723512c6f9b78cef6575b1725b (diff) | |
download | Shaarli-8bbf57a2d0dfe8d8d6416a26f9ff1177c77e806b.tar.gz Shaarli-8bbf57a2d0dfe8d8d6416a26f9ff1177c77e806b.tar.zst Shaarli-8bbf57a2d0dfe8d8d6416a26f9ff1177c77e806b.zip |
Merge pull request #1620 from ArthurHoaro/feature/no-auto-link
Default formatter: add a setting to disable auto-linkification
Diffstat (limited to 'application/formatter')
-rw-r--r-- | application/formatter/BookmarkDefaultFormatter.php | 7 |
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 | /** |