From 740b32b520e6b1723512c6f9b78cef6575b1725b Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 3 Nov 2020 12:38:38 +0100
Subject: Default formatter: add a setting to disable auto-linkification

  + update documentation
  + single parameter for both URL and hashtags

Fixes #1094
---
 application/formatter/BookmarkDefaultFormatter.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'application/formatter')

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
             $bookmark->getDescription() ?? '',
             $bookmark->getAdditionalContentEntry('search_highlight')['description'] ?? []
         );
+        $description = format_description(
+            escape($description),
+            $indexUrl,
+            $this->conf->get('formatter_settings.autolink', true)
+        );
 
-        return $this->replaceTokens(format_description(escape($description), $indexUrl));
+        return $this->replaceTokens($description);
     }
 
     /**
-- 
cgit v1.2.3