adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix redirectUrl issue when loginRedirect is empty

Browse source 
Fixes #9819
This commit is contained in:
chinpei215 2016-12-04 20:06:24 +09:00
parent 307ad80358
commit b7481096c8
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -742,6 +742,9 @@ class AuthComponent extends Component {
if (Router::normalize($redir) === Router::normalize($this->loginAction)) { if (Router::normalize($redir) === Router::normalize($this->loginAction)) {
$redir = $this->loginRedirect; $redir = $this->loginRedirect;
if (!$redir) {
$redir = '/';
}
} }
} elseif ($this->loginRedirect) { } elseif ($this->loginRedirect) {
$redir = $this->loginRedirect; $redir = $this->loginRedirect;

13
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
View file

@ -1652,6 +1652,19 @@ class AuthComponentTest extends CakeTestCase {
Router::reload(); Router::reload();
} }
/**
* Test that redirectUrl() returns '/' if loginRedirect is empty
* and Auth.redirect is the login page.
*
* @return void
*/
public function testRedirectUrlWithoutLoginRedirect() {
$this->Auth->Session->write('Auth.redirect', '/users/login');
$this->Auth->request->addParams(Router::parse('/users/login'));
$result = $this->Auth->redirectUrl();
$this->assertEquals('/', $result);
}
/** /**
* test password hashing * test password hashing
* *