Author: jalkanen
Date: Wed Sep 24 03:09:51 2008
New Revision: 698503
URL: http://svn.apache.org/viewvc?rev=698503&view=rev
Log:
[JSPWIKI-368] Fixed issue with multiple preferences cookies
appearing if the web app was installed to the root. Thanks
to Florian for finding this!
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=698503&r1=698502&r2=698503&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Sep 24 03:09:51 2008
@@ -1,3 +1,11 @@
+2008-09-24 Janne Jalkanen <[EMAIL PROTECTED]>
+
+ * 2.8.0-beta-9
+
+ * [JSPWIKI-368] Fixed issue with multiple preferences cookies
+ appearing if the web app was installed to the root. Thanks
+ to Florian for finding this!
+
2008-09-21 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.8.0-beta-8
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=698503&r1=698502&r2=698503&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Wed Sep 24
03:09:51 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "8";
+ public static final String BUILD = "9";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js?rev=698503&r1=698502&r2=698503&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Wed Sep 24
03:09:51 2008
@@ -230,6 +230,11 @@
var h = location.host;
this.BasePath =
this.BaseUrl.slice(this.BaseUrl.indexOf(h)+h.length,-1);
+ // If JSPWiki is installed in the root, then we have to make
sure that
+ // the cookie-cutter works properly here.
+
+ if( this.BasePath == '' ) this.BasePath = '/';
+
this.prefs = new Hash.Cookie('JSPWikiUserPrefs',
{path:Wiki.BasePath, duration:20});
this.PermissionEdit = !!$$('a.edit')[0]; //deduct permission
level
