Merge pull request #3608 from cakephp/3.0-session-component-fix

Update session component to not specify a default element.
cakephp · May 31, 2014 · fa81057 · fa81057
2 parents d25a0e8 + 6fbd9b8
commit fa81057
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Controller/Component/SessionComponent.php b/src/Controller/Component/SessionComponent.php
@@ -121,7 +121,7 @@ public function check($name) {
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/sessions.html#creating-notification-messages
  */
-	public function setFlash($message, $element = 'default', array $params = array(), $key = 'flash') {
+	public function setFlash($message, $element = null, array $params = array(), $key = 'flash') {
 		$this->_session->flash($message, 'info', $params + compact('element', 'key'));
 	}
 

diff --git a/tests/TestCase/Controller/Component/SessionComponentTest.php b/tests/TestCase/Controller/Component/SessionComponentTest.php
@@ -173,7 +173,7 @@ public function testSessionFlash() {
 		$Session->setFlash('This is a test message');
 		$this->assertEquals(array(
 				'message' => 'This is a test message',
-				'params' => array('element' => 'default'),
+				'params' => array('element' => null),
 				'type' => 'info'
 			), $Session->read('Message.flash'));
 	}