adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renaming "flashLayout" to "flashElement" to be consistent with changes to Session component and helper

Browse source 
Signed-off-by: Mark Story <mark@mark-story.com>
This commit is contained in:
ADmad 2009-10-15 02:57:34 +05:30 • committed by mark_story
parent 2f81c29def
commit 47558d4fe1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/controller/components/auth.php
View file

@ -80,12 +80,12 @@ class AuthComponent extends Object {
var $ajaxLogin = null;
/**
* The name of the layout element used on Session::setFlash
* The name of the element used for SessionComponent::setFlash
*
* @var string
* @access public
*/
var $flashLayout = 'default';
var $flashElement = 'default';
/**
* The name of the model that represents users which will be authenticated. Defaults to 'User'.
@ -361,13 +361,13 @@ class AuthComponent extends Object {
}
}
$this->Session->setFlash($this->loginError, $this->flashLayout, array(), 'auth');
$this->Session->setFlash($this->loginError, $this->flashElement, array(), 'auth');
$controller->data[$model->alias][$this->fields['password']] = null;
return false;
} else {
if (!$this->user()) {
if (!$this->RequestHandler->isAjax()) {
$this->Session->setFlash($this->authError, $this->flashLayout, array(), 'auth');
$this->Session->setFlash($this->authError, $this->flashElement, array(), 'auth');
if (!empty($controller->params['url']) && count($controller->params['url']) >= 2) {
$query = $controller->params['url'];
unset($query['url'], $query['ext']);
@ -431,7 +431,7 @@ class AuthComponent extends Object {
return true;
}
$this->Session->setFlash($this->authError, $this->flashLayout, array(), 'auth');
$this->Session->setFlash($this->authError, $this->flashElement, array(), 'auth');
$controller->redirect($controller->referer(), null, true);
return false;
}