Skip to content
Snippets Groups Projects
Commit ad53a820 authored by Jaime Pérez Crespo's avatar Jaime Pérez Crespo
Browse files

Merge branch 'fix_missing_authtoken_cookie_params_rememberme' of...

Merge branch 'fix_missing_authtoken_cookie_params_rememberme' of https://github.com/renklaf/simplesamlphp into renklaf-fix_missing_authtoken_cookie_params_rememberme
parents e85780ef 6b4a7d92
No related branches found
No related tags found
No related merge requests found
......@@ -755,6 +755,12 @@ class SimpleSAML_Session implements Serializable
{
$sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
if (is_array($params) && !empty($params)) {
$params = array_merge($sessionHandler->getCookieParams(), $params);
} else {
$params = $sessionHandler->getCookieParams();
}
if ($this->sessionId !== null) {
$sessionHandler->setCookie($sessionHandler->getSessionCookieName(), $this->sessionId, $params);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment