Skip to content

Commit 8257100

Browse files
committed
How about this?
1 parent ef1fc7d commit 8257100

File tree

5 files changed

+4
-11
lines changed

5 files changed

+4
-11
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div id="<?php echo $key; ?>Message" class="<?php echo !empty($params['class']) ? $params['class'] : 'message'; ?>"><?php echo $message; ?></div>

lib/Cake/Console/Templates/skel/View/Elements/empty

Whitespace-only changes.

lib/Cake/Controller/Component/AuthComponent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class AuthComponent extends Component {
5050
*
5151
* @var array
5252
*/
53-
public $components = array('Session', 'RequestHandler');
53+
public $components = array('Session', 'Flash', 'RequestHandler');
5454

5555
/**
5656
* An array of authentication objects to use for authenticating users. You can configure
@@ -840,7 +840,7 @@ public function flash($message) {
840840
if ($message === false) {
841841
return;
842842
}
843-
$this->Session->setFlash($message, $this->flash['element'], $this->flash['params'], $this->flash['key']);
843+
$this->Flash->set($message, $this->flash);
844844
}
845845

846846
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div id="<?php echo $key; ?>Message" class="<?php echo !empty($params['class']) ? $params['class'] : 'message'; ?>"><?php echo $message; ?></div>

lib/Cake/View/Helper/FlashHelper.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,6 @@ public function render($key = 'flash', $options = array()) {
8585
$flash = $options + $flash;
8686
CakeSession::delete("Message.$key");
8787

88-
// backwards compatibility with Session->setFlash()
89-
if ($flash['element'] === 'default') {
90-
$class = 'message';
91-
if (!empty($flash['params']['class'])) {
92-
$class = $flash['params']['class'];
93-
}
94-
return '<div id="' . $key . 'Message" class="' . $class . '">' . $flash['message'] . '</div>';
95-
}
96-
9788
return $this->_View->element($flash['element'], $flash);
9889
}
9990
}

0 commit comments

Comments
 (0)