summaryrefslogtreecommitdiff
path: root/inc/init.php
diff options
context:
space:
mode:
authorDominik Eckelmann <deckelmann@gmail.com>2011-08-18 03:40:04 -0700
committerDominik Eckelmann <deckelmann@gmail.com>2011-08-18 03:40:04 -0700
commitb546d8640010d9b5940657881056706d1c4591cc (patch)
tree97ec7ffff2d8ae10d778050da6dfdde9b5ed4f88 /inc/init.php
parent02782d1287173f3981a008755958543c178de296 (diff)
parent73ab87de7441c9c0eac123c1c44c2cf1ffdbe189 (diff)
downloadrpg-b546d8640010d9b5940657881056706d1c4591cc.tar.gz
rpg-b546d8640010d9b5940657881056706d1c4591cc.tar.bz2
Merge pull request #19 from gbirke/master
Make cookie path configurable
Diffstat (limited to 'inc/init.php')
-rw-r--r--inc/init.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/init.php b/inc/init.php
index 819d92bdc..dfa25f8b1 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -146,10 +146,11 @@ if ($conf['gzip_output'] &&
// init session
if (!headers_sent() && !defined('NOSESSION')){
session_name("DokuWiki");
+ $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
if (version_compare(PHP_VERSION, '5.2.0', '>')) {
- session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+ session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true);
}else{
- session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+ session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()));
}
session_start();