Revert "Added l_type parameter to catalog filter URLs"

This reverts commit e2d68a7.
aimeos · Feb 4, 2022 · 0ffff97 · 0ffff97
1 parent e2d68a7
commit 0ffff97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/html/src/Client/Html/Catalog/Filter/Standard.php b/client/html/src/Client/Html/Catalog/Filter/Standard.php
@@ -484,9 +484,6 @@ protected function getSubClientNames() : array
 	public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], string &$expire = null ) : \Aimeos\MW\View\Iface
 	{
 		$config = $this->getContext()->getConfig();
-		$params = $this->getClientParams( $view->param(), ['f_', 'l_type'] );
-
-		$view->filterParams = $params;
 
 		/** client/html/catalog/count/enable
 		 * Enables or disables displaying product counts in the catalog filter
@@ -583,6 +580,8 @@ public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], string
 			 */
 			$conf = $config->get( 'client/html/catalog/count/url/config', [] );
 
+			$params = $this->getClientParams( $view->param(), ['f_'] );
+
 			if( $startid = $config->get( 'client/html/catalog/filter/tree/startid' ) ) {
 				$params['f_catid'] = $startid;
 			}
@@ -606,6 +605,7 @@ public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], string
 				unset( $params[$name] );
 			}
 
+			$view->filterParams = $params;
 			$view->filterCountUrl = $view->url( $target, $controller, $action, $params, [], $conf );
 		}
 

diff --git a/client/html/src/Client/Html/Catalog/Filter/Tree/Standard.php b/client/html/src/Client/Html/Catalog/Filter/Tree/Standard.php
@@ -262,7 +262,7 @@ public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], string
 
 		$view->treeCatalogPath = $catItems;
 		$view->treeCatalogTree = $cntl->visible( $catItems->keys()->all() )->getTree( $cntl::TREE );
-		$view->treeFilterParams = $view->get( 'filterParams', [] );
+		$view->treeFilterParams = $this->getClientParams( $view->param(), ['f_'] );
 
 		$this->addMetaItemCatalog( $view->treeCatalogTree, $expire, $tags );