svn commit: r686469 - in /incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/webdocs/templates/default/AttachmentTab.jsp

[jalkanen]

Author: jalkanen
Date: Sat Aug 16 02:17:56 2008
New Revision: 686469

URL: http://svn.apache.org/viewvc?rev=686469&view=rev
Log:
2.6.4-rc-1: Applied patch for JSPWIKI-319, courtesy of Harry Metske.

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/webdocs/templates/default/AttachmentTab.jsp

Modified: incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog?rev=686469&r1=686468&r2=686469&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/ChangeLog Sat Aug 16 02:17:56 
2008
@@ -1,6 +1,12 @@
+2008-08-16  Janne Jalkanen <[EMAIL PROTECTED]>
+
+        * 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.
         

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=686469&r1=686468&r2=686469&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
 Sat Aug 16 02:17:56 2008
@@ -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

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp?rev=686469&r1=686468&r2=686469&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_6_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
 Sat Aug 16 02:17:56 2008
@@ -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%><%
          }