|
|
@@ -105,8 +105,10 @@ class AuthComponent extends Component {
|
|
|
* - `flash` - Settings to use when Auth needs to do a flash message with
|
|
|
* FlashComponent::set(). Available keys are:
|
|
|
*
|
|
|
- * - `key` - The message domain to use for flashes generated by this component, defaults to 'auth'.
|
|
|
- * - `params` - The array of additional params to use, defaults to []
|
|
|
+ * - `key` - The message domain to use for flashes generated by this component,
|
|
|
+ * defaults to 'auth'.
|
|
|
+ * - `element` - Flash element to use, defaults to 'default'.
|
|
|
+ * - `params` - The array of additional params to use, defaults to ['class' => 'error']
|
|
|
*
|
|
|
* - `loginAction` - A URL (defined as a string or array) to the controller action
|
|
|
* that handles logins. Defaults to `/users/login`.
|
|
|
@@ -422,7 +424,7 @@ class AuthComponent extends Component {
|
|
|
'flash' => [
|
|
|
'element' => 'default',
|
|
|
'key' => 'auth',
|
|
|
- 'params' => []
|
|
|
+ 'params' => ['class' => 'error']
|
|
|
],
|
|
|
'loginAction' => [
|
|
|
'controller' => 'Users',
|
|
|
@@ -785,26 +787,15 @@ class AuthComponent extends Component {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Set a flash message. Uses the Session component, and values from `flash` config.
|
|
|
+ * Set a flash message. Uses the Flash component with values from `flash` config.
|
|
|
*
|
|
|
* @param string $message The message to set.
|
|
|
- * @param string $type Message type. Defaults to 'error'.
|
|
|
* @return void
|
|
|
*/
|
|
|
- public function flash($message, $type = 'error') {
|
|
|
- if ($message === false) {
|
|
|
- return;
|
|
|
- }
|
|
|
- $flashConfig = $this->_config['flash'];
|
|
|
- $key = $flashConfig['key'];
|
|
|
- $params = [];
|
|
|
- if (isset($flashConfig['params'])) {
|
|
|
- $params = $flashConfig['params'];
|
|
|
- }
|
|
|
- if (empty($params['element'])) {
|
|
|
- $params['element'] = 'error';
|
|
|
+ public function flash($message) {
|
|
|
+ if ($message !== false) {
|
|
|
+ $this->Flash->set($message, $this->_config['flash']);
|
|
|
}
|
|
|
- $this->Flash->set($message, $params + compact('key'));
|
|
|
}
|
|
|
|
|
|
/**
|