aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/session.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 0acfa36eb0..ae882a392d 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -537,7 +537,14 @@ class session
{
global $config;
- setcookie($config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $config['cookie_path']);
+ if ($config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1')
+ {
+ setcookie($config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $config['cookie_path']);
+ }
+ else
+ {
+ setcookie($config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']);
+ }
}
/**