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

Merge pull request #4850 from ADmad/issue-4849

Browse source 
Make CakeSession::read() return null for all failure cases.
This commit is contained in:
Mark Story 2014-10-09 13:08:25 -04:00
commit 84eb151dd1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Datasource/CakeSession.php
View file

@ -378,7 +378,7 @@ class CakeSession {
*/ */
public static function read($name = null) { public static function read($name = null) {
if (empty($name) && $name !== null) { if (empty($name) && $name !== null) {
return false; return null;
} }
if (!self::_hasSession() || !self::start()) { if (!self::_hasSession() || !self::start()) {
return null; return null;

2
lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
View file

@ -280,7 +280,7 @@ class CakeSessionTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testReadyEmpty() { public function testReadyEmpty() {
$this->assertFalse(TestCakeSession::read('')); $this->assertNull(TestCakeSession::read(''));
} }
/** /**