Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 13:55:30 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into 1.7

Browse Source
This commit is contained in:
Andy Miller
2020-11-17 15:24:54 -07:00
parent d23588a217 fd0c9823fa
commit 5f3ddd9389
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/Grav/Common/Service/SessionServiceProvider.php
View File

@@ -97,8 +97,13 @@ class SessionServiceProvider implements ServiceProviderInterface
'cookie_domain' => $cookie_domain,
'cookie_secure' => $cookie_secure,
'cookie_httponly' => $cookie_httponly,
'cookie_samesite' => $cookie_samesite
] + (array) $config->get('system.session.options');
];
if ($cookie_samesite) {
$options['cookie_samesite'] = $cookie_samesite;
}
$options += (array) $config->get('system.session.options');
$session = new Session($options);
$session->setAutoStart($enabled);