Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removing the conditional check around including custom session config…

…uration files. This fixes issues where requestAction could cause loss of session settings, and improves the end developers ability to customize the session. Custom session files should ensure that classes/functions are conditionally declared. Fixes #374, #541
  • Loading branch information...
commit 734e4fa87a1c6d302181b74ace32d8855a0e8cb6 1 parent afd67e5
@markstory markstory authored
Showing with 3 additions and 5 deletions.
  1. +3 −5 cake/libs/cake_session.php
View
8 cake/libs/cake_session.php
@@ -562,12 +562,10 @@ function __initSession() {
);
break;
default:
- if (empty($_SESSION)) {
- $config = CONFIGS . Configure::read('Session.save') . '.php';
+ $config = CONFIGS . Configure::read('Session.save') . '.php';
- if (is_file($config)) {
- require($config);
- }
+ if (is_file($config)) {
+ require($config);
}
break;
}
Please sign in to comment.
Something went wrong with that request. Please try again.