diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-26 13:21:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-26 13:21:02 +0100 |
| commit | 630e7077e00b6c1c8023436351f777ef76165642 (patch) | |
| tree | a579c8888083843ffb46f6e0d1d6750f7578c11a /phpBB | |
| parent | 94d90c084b460a1e166db8b2f42fe181eeb9d272 (diff) | |
| parent | 6ac088ea2f17c7a003250511049a725c7e3decae (diff) | |
| download | forums-630e7077e00b6c1c8023436351f777ef76165642.tar forums-630e7077e00b6c1c8023436351f777ef76165642.tar.gz forums-630e7077e00b6c1c8023436351f777ef76165642.tar.bz2 forums-630e7077e00b6c1c8023436351f777ef76165642.tar.xz forums-630e7077e00b6c1c8023436351f777ef76165642.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index dc90d942c3..691d0d5bef 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1063,7 +1063,7 @@ class session $name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata); $expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime); - $domain = (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']; + $domain = (!$config['cookie_domain'] || $config['cookie_domain'] == '127.0.0.1' || strpos($config['cookie_domain'], '.') === false) ? '' : '; domain=' . $config['cookie_domain']; header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . ';' . (($httponly) ? ' HttpOnly' : ''), false); } |