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

Merge branch '2.6' into 2.7

Browse source 
Conflicts:
	lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
	lib/Cake/VERSION.txt
This commit is contained in:
mark_story 2015-04-20 15:42:54 -04:00
commit 096a2ebb72
11 changed files with 55 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -747,7 +747,7 @@ class CakeSession {
* @return void
*/
public static function renew() {
if (!session_id()) {
if (session_id() === '') {
return;
}
if (isset($_COOKIE[session_name()])) {

1
lib/Cake/Model/Datasource/DboSource.php
View file

@ -3566,6 +3566,7 @@ class DboSource extends DataSource {
if ($this->_methodCacheChange) {
Cache::write('method_cache', self::$methodCache, '_cake_core_');
}
parent::__destruct();
}
}