From 7c37cf5b5f5a9d4dd6bb299d8acaa02cb1529412 Mon Sep 17 00:00:00 2001
From: "Larry E. Masters" <phpnut@cakephp.org>
Date: Tue, 19 Jan 2016 16:29:56 -0600
Subject: [PATCH] Using _cookieName() instead session_name()
---
lib/Cake/Model/Datasource/CakeSession.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/Cake/Model/Datasource/CakeSession.php b/lib/Cake/Model/Datasource/CakeSession.php
index 147cc102b..e11bdeeec 100644
--- a/lib/Cake/Model/Datasource/CakeSession.php
+++ b/lib/Cake/Model/Datasource/CakeSession.php
@@ -591,7 +591,7 @@ class CakeSession {
* @return bool
*/
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() === '') {
return;
}
- if (isset($_COOKIE[session_name()])) {
+ if (isset($_COOKIE[static::_cookieName()])) {
setcookie(Configure::read('Session.cookie'), '', time() - 42000, static::$path);
}
if (!headers_sent()) {