Skip to content
Permalink
Browse files

Renaming "flashLayout" to "flashElement" to be consistent with change…

…s to Session component and helper

Signed-off-by: Mark Story <mark@mark-story.com>
  • Loading branch information...
ADmad authored and markstory committed Oct 14, 2009
1 parent 7b1d216 commit 4d4447746ad42664c571e6d22101f53f94f63ae0
Showing with 5 additions and 5 deletions.
  1. +5 −5 cake/libs/controller/components/auth.php
@@ -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 @@ function startup(&$controller) {
}
}
$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 @@ function startup(&$controller) {
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;
}

0 comments on commit 4d44477

Please sign in to comment.
You can’t perform that action at this time.