diff --git a/library/Class/CriteresRecherche.php b/library/Class/CriteresRecherche.php index baa5a7f58bb842621e2e2e039e535fd19d6cccbb..d072d3f97836222619bab4a47b4f85d0c08e3161 100644 --- a/library/Class/CriteresRecherche.php +++ b/library/Class/CriteresRecherche.php @@ -445,7 +445,7 @@ class Class_CriteresRecherche { unset($intersect['filtres']); if ($intersect) return array_merge(['controller' => 'recherche', - 'action' => 'simple'], + 'action' => 'simple'], $intersect); return ['controller'=>'recherche', @@ -547,12 +547,7 @@ class Class_CriteresRecherche { 'retour_avis' => $this->_params['retour_avis']] ; } - if (array_intersect_key($this->_params, self::$criteres)) - return $this->getUrlCriteresWithFacettes(); - - - return ['controller' => 'recherche', - 'action' => 'simple']; + return $this->getUrlCriteresWithFacettes(); } diff --git a/tests/library/Class/CriteresRechercheTest.php b/tests/library/Class/CriteresRechercheTest.php index 431304eb50c09a17fd423a8963a8b65046068c06..4f1301a70239cbb623228332f32db47a05b06992 100644 --- a/tests/library/Class/CriteresRechercheTest.php +++ b/tests/library/Class/CriteresRechercheTest.php @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -class CriteresRerchercheRetourTest extends AbstractControllerTestCase { +class CriteresRechercheRetourTest extends AbstractControllerTestCase { public function setUp() { $this->criteres_recherche= new Class_CriteresRecherche(); } @@ -35,6 +35,10 @@ class CriteresRerchercheRetourTest extends AbstractControllerTestCase { 'action' => 'simple', 'expressionRecherche' => 'millenium']], + [['facette' => 'A2'], ['controller' => 'recherche', + 'action' => 'simple', + 'facettes' => 'A2']], + [['expressionRecherche' => 'millenium reine', 'page' => 2], ['controller' => 'recherche', 'action' => 'simple',