Merge branch 'master' into 2.7

This commit is contained in:
mark_story 2015-01-03 14:34:55 -05:00
commit 4cd2c8fdcb
14 changed files with 188 additions and 54 deletions
lib/Cake/Model/Datasource

View file

@ -512,7 +512,12 @@ class CakeSession {
if (!empty($sessionConfig['handler'])) {
$sessionConfig['ini']['session.save_handler'] = 'user';
} elseif (!empty($sessionConfig['session.save_path']) && Configure::read('debug')) {
if (!is_dir($sessionConfig['session.save_path'])) {
mkdir($sessionConfig['session.save_path'], 0775, true);
}
}
if (!isset($sessionConfig['ini']['session.gc_maxlifetime'])) {
$sessionConfig['ini']['session.gc_maxlifetime'] = $sessionConfig['timeout'] * 60;
}