summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2013-10-08 00:06:46 +0200
committerGerrit Uitslag <klapinklapin@gmail.com>2013-10-08 00:06:46 +0200
commit75e4dd8a2ec6c181e99877919b5a2b529407752a (patch)
tree82004f563b839c2f6a689fc6487d21d3cb2bd083 /lib
parent13af2b2c9bce9b46a0060d4d0b896ed69ebc3755 (diff)
downloadrpg-75e4dd8a2ec6c181e99877919b5a2b529407752a.tar.gz
rpg-75e4dd8a2ec6c181e99877919b5a2b529407752a.tar.bz2
Use in cookie a correct path, added DOKU_COOKIEPATH to js constants
Fixes FS#2837
Diffstat (limited to 'lib')
-rw-r--r--lib/exe/js.php1
-rw-r--r--lib/scripts/cookie.js2
2 files changed, 2 insertions, 1 deletions
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});
},
/**