aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-03-21 19:23:34 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-03-21 19:23:34 +0000
commit21de871aff0392803dd98ab8a895fabac35f4219 (patch)
treeaa052fe762be977462e92b755e59dacb0c4ea559 /phpBB/includes/session.php
parent44c60cff4de351523f950ca7fac114d1a2769b82 (diff)
downloadforums-21de871aff0392803dd98ab8a895fabac35f4219.tar
forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.gz
forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.bz2
forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.xz
forums-21de871aff0392803dd98ab8a895fabac35f4219.zip
- a bunch of bugfixes. :P
git-svn-id: file:///svn/phpbb/trunk@5678 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 6a8a79d292..a478c8466e 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -638,12 +638,18 @@ class session
{
global $config;
- if ($config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1')
+ if (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1')
{
setcookie($config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $config['cookie_path']);
}
else
{
+ // Firefox does not allow setting cookies with a domain containing no periods.
+ if (strpos($config['cookie_domain'], '.') === false)
+ {
+ $config['cookie_domain'] = '.' . $config['cookie_domain'];
+ }
+
setcookie($config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']);
}
}