From bc07446a82363c9a8eedcc916ec816a55a3de8b7 Mon Sep 17 00:00:00 2001
From: Luciano Righetti <luciano.righetti@gmail.com>
Date: Wed, 15 Nov 2023 12:04:28 +0100
Subject: [PATCH] fix: taxonomy view filter is not kept when switching pages,
 fixes #8875

---
 app/Controller/TaxonomiesController.php    | 2 +-
 app/View/Taxonomies/ajax/taxonomy_tags.ctp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Controller/TaxonomiesController.php b/app/Controller/TaxonomiesController.php
index d4fe280ba..d9af64a03 100644
--- a/app/Controller/TaxonomiesController.php
+++ b/app/Controller/TaxonomiesController.php
@@ -99,12 +99,12 @@ class TaxonomiesController extends AppController
             $taxonomy['entries'][$key]['events'] = $count;
             $taxonomy['entries'][$key]['attributes'] = $count_a;
         }
-        $this->set('filter', $filter);
         $customPagination = new CustomPaginationTool();
         $params = $customPagination->createPaginationRules($taxonomy['entries'], $this->passedArgs, 'TaxonomyEntry');
         if ($params['sort'] == 'id') {
             $params['sort'] = 'tag';
         }
+        $params['options'] = ['filter' => $filter];
         $this->params->params['paging'] = array($this->modelClass => $params);
         $params = $customPagination->applyRulesOnArray($taxonomy['entries'], $params, 'taxonomies');
         if ($this->_isRest()) {
diff --git a/app/View/Taxonomies/ajax/taxonomy_tags.ctp b/app/View/Taxonomies/ajax/taxonomy_tags.ctp
index e7b422af3..fa4afa9f6 100644
--- a/app/View/Taxonomies/ajax/taxonomy_tags.ctp
+++ b/app/View/Taxonomies/ajax/taxonomy_tags.ctp
@@ -191,7 +191,6 @@ echo $this->element('/genericElements/IndexTable/scaffold', ['scaffold_data' =>
     'paginatorOptions' => [
         'url' => [$taxonomy['id']]
     ],
-    'persistUrlParams' => ['filter']
 ],
     'containerId' => 'preview_taxonomy_tags_container'
 ]]);