2.6.4-rc-1: Applied patch for JSPWIKI-319, courtesy of Harry Metske.
git-svn-id: https://svn.apache.org/repos/asf/incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH@686469 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ChangeLog b/ChangeLog
index 3f0365d..15f2980 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2008-08-16 Janne Jalkanen <jalkanen@apache.org>
+
+ * 2.6.4-rc-1
+
+ * JSPWIKI-319: Change Note extra checks.
+
2008-07-16 Andrew Jaquith <ajaquith AT apache DOT org>
- * 2.5.3-build-3
+ * 2.6.4-svn-1
* JSPWIKI-315: added extra checks to AttachmentServlet.
diff --git a/src/com/ecyrd/jspwiki/Release.java b/src/com/ecyrd/jspwiki/Release.java
index 3367e7d..e0f9026 100644
--- a/src/com/ecyrd/jspwiki/Release.java
+++ b/src/com/ecyrd/jspwiki/Release.java
@@ -66,7 +66,7 @@
public static final int REVISION = 6;
/** The minor revision. */
- public static final int MINORREVISION = 3;
+ public static final int MINORREVISION = 4;
/** The build number/identifier. This is a String as opposed to an integer, just
* so that people can add other identifiers to it. The build number is incremented
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "";
/**
* This is the generic version string you should use
diff --git a/src/webdocs/templates/default/AttachmentTab.jsp b/src/webdocs/templates/default/AttachmentTab.jsp
index e2c7e83..e1dd13e 100644
--- a/src/webdocs/templates/default/AttachmentTab.jsp
+++ b/src/webdocs/templates/default/AttachmentTab.jsp
@@ -118,7 +118,7 @@
</wiki:Permission>
<td class="changenote">
<%
- String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
+ String changeNote = TextUtil.replaceEntities((String)att.getAttribute(WikiPage.CHANGENOTE));
if( changeNote != null ) {
%><%=changeNote%><%
}
