diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:14:24 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:14:24 +0100 |
| commit | 55a71a16cbfacd3836ca70e37e45f85bd44ceab1 (patch) | |
| tree | 22721869994c6acdc9720aa4ef3bcac4cb1eab65 /inc/init.php | |
| parent | c09f0eb1d9009ce0a7d2a12c41b125957604eff5 (diff) | |
| download | rpg-55a71a16cbfacd3836ca70e37e45f85bd44ceab1.tar.gz rpg-55a71a16cbfacd3836ca70e37e45f85bd44ceab1.tar.bz2 | |
removed pre PHP 5.2 code wrt setcookie and session setting
- moved cookiedir determination in the if-statement
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/inc/init.php b/inc/init.php index 08f4b45b9..9b8465911 100644 --- a/inc/init.php +++ b/inc/init.php @@ -143,16 +143,14 @@ if ($conf['gzip_output'] && if(!headers_sent() && !defined('NOSESSION')) { if(!defined('DOKU_SESSION_NAME')) define ('DOKU_SESSION_NAME', "DokuWiki"); if(!defined('DOKU_SESSION_LIFETIME')) define ('DOKU_SESSION_LIFETIME', 0); - $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; - if(!defined('DOKU_SESSION_PATH')) define ('DOKU_SESSION_PATH', $cookieDir); + if(!defined('DOKU_SESSION_PATH')) { + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; + define ('DOKU_SESSION_PATH', $cookieDir); + } if(!defined('DOKU_SESSION_DOMAIN')) define ('DOKU_SESSION_DOMAIN', ''); session_name(DOKU_SESSION_NAME); - if(version_compare(PHP_VERSION, '5.2.0', '>')) { - session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl()), true); - } else { - session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl())); - } + session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl()), true); session_start(); // load left over messages |