diff options
| author | lupo49 <post@lupo49.de> | 2011-08-22 19:11:18 +0200 |
|---|---|---|
| committer | lupo49 <post@lupo49.de> | 2011-08-22 19:11:18 +0200 |
| commit | d8f231b5162801fe333f899552b5808a83282634 (patch) | |
| tree | f8021011b52502521eeff4f33e368628bb73ba89 /inc/init.php | |
| parent | 8e5a3957cd8de15f48dc27e9c07dfe4033fd6997 (diff) | |
| parent | 1c5f7481f4e685ad3ffe9ba48ed47ed75196e64a (diff) | |
| download | rpg-d8f231b5162801fe333f899552b5808a83282634.tar.gz rpg-d8f231b5162801fe333f899552b5808a83282634.tar.bz2 | |
Merge remote branch 'upstream/master'
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 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(); |