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

Merge pull request #8069 from cakephp/issue-#8062

Browse source 
Using _cookieName() instead session_name()
This commit is contained in:
Larry E. Masters 2016-01-19 16:57:49 -06:00
commit 2751f4482d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -591,7 +591,7 @@ class CakeSession {
* @return bool * @return bool
*/ */
protected static function _hasSession() { protected static function _hasSession() {
return static::started() || isset($_COOKIE[session_name()]) || (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg'); return static::started() || isset($_COOKIE[static::_cookieName()]) || (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg');
} }
/** /**
@ -757,7 +757,7 @@ class CakeSession {
if (session_id() === '') { if (session_id() === '') {
return; return;
} }
if (isset($_COOKIE[session_name()])) { if (isset($_COOKIE[static::_cookieName()])) {
setcookie(Configure::read('Session.cookie'), '', time() - 42000, static::$path); setcookie(Configure::read('Session.cookie'), '', time() - 42000, static::$path);
} }
if (!headers_sent()) { if (!headers_sent()) {