mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-11 17:24:46 +02:00
Code Issues Releases Wiki Activity

Attempt fix issue processwire/processwire-issues#1443

Browse Source
This commit is contained in:
Ryan Cramer
2021-10-04 10:29:50 -04:00
parent c988925111
commit 68bd38d1c9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wire/modules/Process/ProcessLogin/ProcessLogin.module
View File

@@ -537,6 +537,7 @@ class ProcessLogin extends Process implements ConfigurableModule {
public function ___login($name, $pass) { public function ___login($name, $pass) {
$session = $this->wire()->session; $session = $this->wire()->session;
$input = $this->wire()->input;
if($name && $pass) { if($name && $pass) {
$loginUser = $session->login($name, $pass); $loginUser = $session->login($name, $pass);
@@ -546,7 +547,8 @@ class ProcessLogin extends Process implements ConfigurableModule {
if($loginUser && $loginUser->id) { if($loginUser && $loginUser->id) {
$this->loginSuccess($loginUser); $this->loginSuccess($loginUser);
$this->afterLoginRedirect('./'); $url = $input->urlSegment1 === 'navJSON' ? '../' : './';
$this->afterLoginRedirect($url);
} else { } else {
$this->loginFailed($this->submitLoginName ? $this->submitLoginName : $name); $this->loginFailed($this->submitLoginName ? $this->submitLoginName : $name);
@@ -865,6 +867,7 @@ class ProcessLogin extends Process implements ConfigurableModule {
$session->removeFor($this, 'afterLoginPageId'); $session->removeFor($this, 'afterLoginPageId');
$session->removeFor('ProcessPageView', 'loginRequestPageID'); $session->removeFor('ProcessPageView', 'loginRequestPageID');
$session->removeFor('ProcessPageView', 'loginRequestURL'); $session->removeFor('ProcessPageView', 'loginRequestURL');
if(strpos($url, '/navJSON') !== false) $url = str_replace(array('/navJSON/', '/navJSON'), '/', $url);
$session->redirect($url, false); $session->redirect($url, false);
} }