mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
Revert "Update app-00-add-logout_url-conf.patch"
This reverts commit ca4ad9a444
.
This commit is contained in:
parent
34e482baa9
commit
156dadf5f2
1 changed files with 17 additions and 19 deletions
|
@ -1,23 +1,21 @@
|
||||||
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
|
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
|
||||||
index db3e8a64d64..fe63a896c85 100644
|
index 13aef8f67a..55d8dbf9d1 100644
|
||||||
--- a/core/Controller/LoginController.php
|
--- a/core/Controller/LoginController.php
|
||||||
+++ b/core/Controller/LoginController.php
|
+++ b/core/Controller/LoginController.php
|
||||||
@@ -97,11 +97,13 @@ class LoginController extends Controller {
|
@@ -119,11 +119,12 @@ class LoginController extends Controller {
|
||||||
}
|
}
|
||||||
$this->userSession->logout();
|
$this->userSession->logout();
|
||||||
|
|
||||||
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
|
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
|
||||||
- 'core.login.showLoginForm',
|
- '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
|
- ['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(
|
||||||
+ $redirectUrl = $this->config->getSystemValue('logout_url',
|
+ 'core.login.showLoginForm',
|
||||||
++ $this->urlGenerator->linkToRouteAbsolute(
|
+ ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers)
|
||||||
++ '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');
|
||||||
++ $response = new RedirectResponse($redirectUrl);
|
$this->session->close();
|
||||||
$this->session->set('clearingExecutionContexts', '1');
|
|
||||||
$this->session->close();
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue