Merge branch 'develop' into develop

This commit is contained in:
Min-Soo Kim 2018-07-29 11:49:27 +09:00 committed by GitHub
commit ec54bbd415
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 13 deletions

View file

@ -295,7 +295,7 @@ class Session
if(!$is_default_domain && !\Context::get('sso_response') && $_COOKIE['sso'] !== md5($current_domain))
{
// Set sso cookie to prevent multiple simultaneous SSO validation requests.
setcookie('sso', md5($current_domain), 0, '/');
setcookie('sso', md5($current_domain), 0, '/', null, \Context::isAlwaysSSL());
// Redirect to the default site.
$sso_request = Security::encrypt($current_url);