diff --git a/components/Collection/templates/collection/notes.html.twig b/components/Collection/templates/collection/notes.html.twig
index f8677e9e32..4cb013ed15 100644
--- a/components/Collection/templates/collection/notes.html.twig
+++ b/components/Collection/templates/collection/notes.html.twig
@@ -14,7 +14,7 @@
{{ page_title | trans }}
{% endif %}
diff --git a/plugins/NoteTypeFeedFilter/NoteTypeFeedFilter.php b/plugins/NoteTypeFeedFilter/NoteTypeFeedFilter.php
index 11898db361..fa0dda278b 100644
--- a/plugins/NoteTypeFeedFilter/NoteTypeFeedFilter.php
+++ b/plugins/NoteTypeFeedFilter/NoteTypeFeedFilter.php
@@ -124,37 +124,39 @@ class NoteTypeFeedFilter extends Plugin
/**
* Draw the media feed navigation.
*/
- public function onAddFeedActions(Request $request, &$res): bool
+ public function onAddFeedActions(Request $request, bool $is_not_empty, &$res): bool
{
- $qs = [];
- parse_str($request->getQueryString(), $qs);
- if (\array_key_exists('p', $qs) && \is_string($qs['p'])) {
- unset($qs['p']);
- }
- $types = $this->normalizeTypesList(\is_null($request->get('note-types')) ? [] : explode(',', $request->get('note-types')), add_missing: false);
- $ftypes = array_flip($types);
+ if ($is_not_empty) {
+ $qs = [];
+ parse_str($request->getQueryString(), $qs);
+ if (\array_key_exists('p', $qs) && \is_string($qs['p'])) {
+ unset($qs['p']);
+ }
+ $types = $this->normalizeTypesList(\is_null($request->get('note-types')) ? [] : explode(',', $request->get('note-types')), add_missing: false);
+ $ftypes = array_flip($types);
- $tabs = [
- 'all' => [
- 'active' => empty($types) || $types === self::ALLOWED_TYPES,
- 'url' => '?' . http_build_query(['note-types' => implode(',', self::ALLOWED_TYPES)], '', '&', \PHP_QUERY_RFC3986),
- 'icon' => 'All',
- ],
- ];
-
- foreach (self::ALLOWED_TYPES as $allowed_type) {
- $active = \array_key_exists($allowed_type, $ftypes);
- $new_types = $this->normalizeTypesList([($active ? '!' : '') . $allowed_type, ...$types], add_missing: false);
- $new_qs = $qs;
- $new_qs['note-types'] = implode(',', $new_types);
- $tabs[$allowed_type] = [
- 'active' => $active,
- 'url' => '?' . http_build_query($new_qs, '', '&', \PHP_QUERY_RFC3986),
- 'icon' => $allowed_type,
+ $tabs = [
+ 'all' => [
+ 'active' => empty($types) || $types === self::ALLOWED_TYPES,
+ 'url' => '?' . http_build_query(['note-types' => implode(',', self::ALLOWED_TYPES)], '', '&', \PHP_QUERY_RFC3986),
+ 'icon' => 'All',
+ ],
];
- }
- $res[] = Formatting::twigRenderFile('NoteTypeFeedFilter/tabs.html.twig', ['tabs' => $tabs]);
+ foreach (self::ALLOWED_TYPES as $allowed_type) {
+ $active = \array_key_exists($allowed_type, $ftypes);
+ $new_types = $this->normalizeTypesList([($active ? '!' : '') . $allowed_type, ...$types], add_missing: false);
+ $new_qs = $qs;
+ $new_qs['note-types'] = implode(',', $new_types);
+ $tabs[$allowed_type] = [
+ 'active' => $active,
+ 'url' => '?' . http_build_query($new_qs, '', '&', \PHP_QUERY_RFC3986),
+ 'icon' => $allowed_type,
+ ];
+ }
+
+ $res[] = Formatting::twigRenderFile('NoteTypeFeedFilter/tabs.html.twig', ['tabs' => $tabs]);
+ }
return Event::next;
}