Merge branch 'hotline_#17790_after_login_to_modules_redirect_to_referer' into 'hotline_6.57'

Hotline #17790 after login to modules redirect to referer

See merge request !558

VERSIONS_HOTLINE/hotline_#17790_should_redirect_to_referer

+- ticket: 17790: Ressources numériques
+  - Le processus de connexion pour accéder à la ressources numérique redirige correctement vers l'url 'referer'
\ No newline at end of file

library/Class/Systeme/ModulesMenu/SSOAbstract.php

@@ -28,9 +28,8 @@ abstract class Class_Systeme_ModulesMenu_SSOAbstract extends Class_Systeme_Modul
 
 
 	public function loginUrl() {
-		return Class_Url::assemble(array_filter(['controller' => 'auth',
-																						 'action' => 'login',
-																						 'redirect' => $this ->_login_redirect_url]));
+		return Class_Url::assemble(array_filter(['controller' => 'auth', 'action' => 'login'])) .
+			'?redirect=' . urlencode($this ->_login_redirect_url);
 	}
 
 

tests/application/modules/opac/controllers/ModulesControllerTest.php

@@ -43,7 +43,7 @@ class ModulesControllerLoginRequiredTest extends AbstractControllerTestCase {
 
 		$this->dispatch('/opac/modules/' . $action);
 
-		$this->assertContains('/auth/login/redirect/'.urlencode('/opac/cms/articleview/id/23'),
+		$this->assertContains('/auth/login?redirect='.urlencode('/opac/cms/articleview/id/23'),
 													$this->_response->getBody());
 	}
 }