Author: jalkanen
Date: Tue May 27 11:32:23 2008
New Revision: 660640
URL: http://svn.apache.org/viewvc?rev=660640&view=rev
Log:
Provisional fix for ACL issue; thanks to Steve for the tip.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog?rev=660640&r1=660639&r2=660640&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog Tue May 27 11:32:23
2008
@@ -1,6 +1,11 @@
-2008-05-22 Janne Jalkanen <[EMAIL PROTECTED]>
+2008-05-27 Janne Jalkanen <[EMAIL PROTECTED]>
- * 2.6.3
+ * 2.6.3-rc-2
+
+ * Fix for JSPWIKI-260 accidentally had old i18n files still.
+
+ * Provisional fix for strange ACL issue detected by Florian;
+ fix provided by Steve.
2008-05-17 Janne Jalkanen <[EMAIL PROTECTED]>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=660640&r1=660639&r2=660640&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/Release.java
Tue May 27 11:32:23 2008
@@ -57,7 +57,7 @@
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "";
+ private static final String POSTFIX = "rc";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "";
+ public static final String BUILD = "2";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=660640&r1=660639&r2=660640&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Tue May 27 11:32:23 2008
@@ -1296,7 +1296,7 @@
if( !m_parseAccessRules ) return m_currentElement;
Acl acl;
- WikiPage page = m_context.getPage();
+ WikiPage page = m_context.getRealPage();
// UserDatabase db = m_context.getEngine().getUserDatabase();
if( ruleLine.startsWith( "{" ) )
