hotline #147804 : fix regression

application/modules/opac/controllers/RechercheController.php

@@ -153,13 +153,27 @@ class RechercheController extends ZendAfi_Controller_Action {
       return $this;
 
     $settings = new Class_User_Settings($user);
-
-    if ( $this->_getParam('save_user_settings', null)) {
+    if ($this->_getParam('save_user_settings', null)) {
+      $this->_saveOrderParam($settings, $criteria);
       $settings
-        ->setSearchOrder($criteria->getTri())
         ->setSearchLayout($criteria->getFormat())
         ->setSearchPageSize($criteria->getPageSize())
         ->save();
+
+      return $this;
+    }
+
+    if ($tri = $settings->getSearchOrder())
+      $criteria->setParam('tri', $tri);
+
+    return $this;
+  }
+
+
+  protected function _saveOrderParam(Class_User_Settings $settings,
+                                     Class_CriteresRecherche $criteria) : self {
+    if ($tri = $criteria->getParam('tri')) {
+      $settings->setSearchOrder($tri);
       return $this;
     }
 

tests/scenarios/Templates/TemplatesUserSettingsTest.php

@@ -217,7 +217,7 @@ class TemplatesUserSettingsSearchSaveChiliAndSearchOrderTest extends TemplatesUs
 
 
   /** @test */
-  public function searchWithSaveUserSettingsAndNoOrderShouldUseAlphaTitreTest() {
+  public function searchWithSaveUserSettingsAndNoOrderShouldUseAlphaTitreAsc() {
     $this->dispatch('/recherche/simple/save_user_settings/1');
     $this->assertXPath('//div//select/option[@selected][@value="alpha_titre asc"]');
   }
@@ -226,7 +226,8 @@ class TemplatesUserSettingsSearchSaveChiliAndSearchOrderTest extends TemplatesUs
   /** @test */
   public function userSearchOrderShouldBeAlphaTitreAsc() {
     $this->dispatch('/recherche/simple/save_user_settings/1');
-    $this->assertEquals('alpha_titre asc', (new Class_User_Settings(Class_Users::getIdentity()))->getSearchOrder());
+    $this->assertEquals('alpha_titre asc',
+                        (new Class_User_Settings(Class_Users::getIdentity()))->getSearchOrder());
   }
 }