diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-08 00:06:46 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-08 00:06:46 +0200 |
| commit | 75e4dd8a2ec6c181e99877919b5a2b529407752a (patch) | |
| tree | 82004f563b839c2f6a689fc6487d21d3cb2bd083 | |
| parent | 13af2b2c9bce9b46a0060d4d0b896ed69ebc3755 (diff) | |
| download | rpg-75e4dd8a2ec6c181e99877919b5a2b529407752a.tar.gz rpg-75e4dd8a2ec6c181e99877919b5a2b529407752a.tar.bz2 | |
Use in cookie a correct path, added DOKU_COOKIEPATH to js constants
Fixes FS#2837
| -rw-r--r-- | inc/common.php | 3 | ||||
| -rw-r--r-- | lib/exe/js.php | 1 | ||||
| -rw-r--r-- | lib/scripts/cookie.js | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/inc/common.php b/inc/common.php index 3312141c8..866e0aadd 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1625,7 +1625,8 @@ function set_doku_pref($pref, $val) { } if (!empty($cookieVal)) { - setcookie('DOKU_PREFS', $cookieVal, time()+365*24*3600, DOKU_BASE, '', ($conf['securecookie'] && is_ssl())); + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; + setcookie('DOKU_PREFS', $cookieVal, time()+365*24*3600, $cookieDir, '', ($conf['securecookie'] && is_ssl())); } } diff --git a/lib/exe/js.php b/lib/exe/js.php index 76238a81b..fc7a869c2 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -89,6 +89,7 @@ function js_out(){ // add some global variables print "var DOKU_BASE = '".DOKU_BASE."';"; print "var DOKU_TPL = '".tpl_basedir()."';"; + print "var DOKU_COOKIEPATH = '" . (empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']) . "';"; // FIXME: Move those to JSINFO print "var DOKU_UHN = ".((int) useHeading('navigation')).";"; print "var DOKU_UHC = ".((int) useHeading('content')).";"; diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js index 3ad67bfa4..4cb527f26 100644 --- a/lib/scripts/cookie.js +++ b/lib/scripts/cookie.js @@ -30,7 +30,7 @@ var DokuCookie = { text.push(encodeURIComponent(key)+'#'+encodeURIComponent(val)); } }); - jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_BASE}); + jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIEPATH}); }, /** |