diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-05-16 13:13:00 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-07-23 21:19:21 +0200 |
commit | c79473bd84ab5aba7836d2caaf61847cabaf1e53 (patch) | |
tree | d4b730c015a91c1f390e4153c82cdf0395cf90af /application | |
parent | 72caf4e84c412ab6a4181b83a96dbef8ebb3c65a (diff) | |
download | Shaarli-c79473bd84ab5aba7836d2caaf61847cabaf1e53.tar.gz Shaarli-c79473bd84ab5aba7836d2caaf61847cabaf1e53.tar.zst Shaarli-c79473bd84ab5aba7836d2caaf61847cabaf1e53.zip |
Handle tag filtering in the Bookmark service
Diffstat (limited to 'application')
-rw-r--r-- | application/bookmark/BookmarkFileService.php | 1 | ||||
-rw-r--r-- | application/front/controllers/TagCloudController.php | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/application/bookmark/BookmarkFileService.php b/application/bookmark/BookmarkFileService.php index fef998fd..3b3812af 100644 --- a/application/bookmark/BookmarkFileService.php +++ b/application/bookmark/BookmarkFileService.php | |||
@@ -296,6 +296,7 @@ class BookmarkFileService implements BookmarkServiceInterface | |||
296 | if (empty($tag) | 296 | if (empty($tag) |
297 | || (! $this->isLoggedIn && startsWith($tag, '.')) | 297 | || (! $this->isLoggedIn && startsWith($tag, '.')) |
298 | || $tag === BookmarkMarkdownFormatter::NO_MD_TAG | 298 | || $tag === BookmarkMarkdownFormatter::NO_MD_TAG |
299 | || in_array($tag, $filteringTags, true) | ||
299 | ) { | 300 | ) { |
300 | continue; | 301 | continue; |
301 | } | 302 | } |
diff --git a/application/front/controllers/TagCloudController.php b/application/front/controllers/TagCloudController.php index b6f4a0ce..9389c2b0 100644 --- a/application/front/controllers/TagCloudController.php +++ b/application/front/controllers/TagCloudController.php | |||
@@ -39,9 +39,6 @@ class TagCloudController extends ShaarliController | |||
39 | $logMaxCount = $maxCount > 1 ? log($maxCount, 30) : 1; | 39 | $logMaxCount = $maxCount > 1 ? log($maxCount, 30) : 1; |
40 | $tagList = []; | 40 | $tagList = []; |
41 | foreach ($tags as $key => $value) { | 41 | foreach ($tags as $key => $value) { |
42 | if (in_array($key, $filteringTags)) { | ||
43 | continue; | ||
44 | } | ||
45 | // Tag font size scaling: | 42 | // Tag font size scaling: |
46 | // default 15 and 30 logarithm bases affect scaling, | 43 | // default 15 and 30 logarithm bases affect scaling, |
47 | // 2.2 and 0.8 are arbitrary font sizes in em. | 44 | // 2.2 and 0.8 are arbitrary font sizes in em. |