From ca4ad9a444a88e524e25d4a02298ed94b3bb123c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 17 Dec 2023 18:37:29 +0100
Subject: [PATCH] Update app-00-add-logout_url-conf.patch

---
 .../app-00-add-logout_url-conf.patch          | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/sources/patches_last_version/app-00-add-logout_url-conf.patch b/sources/patches_last_version/app-00-add-logout_url-conf.patch
index 919f2d4..31ab09d 100644
--- a/sources/patches_last_version/app-00-add-logout_url-conf.patch
+++ b/sources/patches_last_version/app-00-add-logout_url-conf.patch
@@ -1,21 +1,23 @@
 diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
-index 13aef8f67a..55d8dbf9d1 100644
+index db3e8a64d64..fe63a896c85 100644
 --- a/core/Controller/LoginController.php
 +++ b/core/Controller/LoginController.php
-@@ -119,11 +119,12 @@ class LoginController extends Controller {
- 		}
- 		$this->userSession->logout();
- 
--		$response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
--			'core.login.showLoginForm',
--			['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
-+		$redirectUrl = $this->config->getSystemValue('logout_url',
-+			$this->urlGenerator->linkToRouteAbsolute(
-+				'core.login.showLoginForm',
-+				['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers)
- 		));
+@@ -97,11 +97,13 @@ class LoginController extends Controller {
+                }
+                $this->userSession->logout();
+
+-               $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
+-                       'core.login.showLoginForm',
+-                       ['clear' => true] // this param the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
+-               ));
 -
-+		$response = new RedirectResponse($redirectUrl);
- 		$this->session->set('clearingExecutionContexts', '1');
- 		$this->session->close();
++               $redirectUrl = $this->config->getSystemValue('logout_url',
+++                      $this->urlGenerator->linkToRouteAbsolute(
+++                              'core.login.showLoginForm',
+++                              ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers)
++               ));
++-
+++              $response = new RedirectResponse($redirectUrl);
+                $this->session->set('clearingExecutionContexts', '1');
+                $this->session->close();