diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-08-25 15:01:15 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-08-25 15:01:15 +0300 |
| commit | 47e84e7a9713558efde9ea83063d3e0830651622 (patch) | |
| tree | 8416e23249ee823249a98c8a0fbf88cfe26b80d7 /inc/init.php | |
| parent | 80525638759a0bfe0ca5d83d9b06430f0d94c2ac (diff) | |
| parent | 1c5f7481f4e685ad3ffe9ba48ed47ed75196e64a (diff) | |
| download | rpg-47e84e7a9713558efde9ea83063d3e0830651622.tar.gz rpg-47e84e7a9713558efde9ea83063d3e0830651622.tar.bz2 | |
merging
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/init.php b/inc/init.php index e82e26efd..b3acf2e33 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(); |