jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1433618 - in /incubator/jspwiki/trunk: ChangeLog src/org/apache/wiki/Release.java src/webdocs/Comment.jsp src/webdocs/Edit.jsp src/webdocs/templates/default/InfoContent.jsp
Date Tue, 15 Jan 2013 20:34:08 GMT
Author: metskem
Date: Tue Jan 15 20:34:08 2013
New Revision: 1433618

URL: http://svn.apache.org/viewvc?rev=1433618&view=rev
Log:
2013-01-15  Harry Metske <metskem@apache.org>

       * 2.9.1-svn-18
       
       * fixed JSPWIKI-712  Entities in ChangeNote should be decoded when "keep editing"

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/webdocs/Comment.jsp
    incubator/jspwiki/trunk/src/webdocs/Edit.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1433618&r1=1433617&r2=1433618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Jan 15 20:34:08 2013
@@ -1,3 +1,9 @@
+2013-01-15  Harry Metske <metskem@apache.org>
+
+       * 2.9.1-svn-18
+       
+       * fixed JSPWIKI-712  Entities in ChangeNote should be decoded when "keep editing"
+
 2013-01-14  Harry Metske <metskem@apache.org>
 
        * 2.9.1-svn-17

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1433618&r1=1433617&r2=1433618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Tue Jan 15 20:34:08 2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "17";
+    public static final String     BUILD         = "18";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=1433618&r1=1433617&r2=1433618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Tue Jan 15 20:34:08 2013
@@ -73,10 +73,10 @@
     String ok      = request.getParameter("ok");
     String preview = request.getParameter("preview");
     String cancel  = request.getParameter("cancel");
-    String author  = TextUtil.replaceEntities( request.getParameter("author") );
-    String link    = TextUtil.replaceEntities( request.getParameter("link") );
+    String author  = request.getParameter("author");
+    String link    = request.getParameter("link");
     String remember = request.getParameter("remember");
-    String changenote = TextUtil.replaceEntities( request.getParameter( "changenote" ) );
+    String changenote = request.getParameter( "changenote" );
 
     WikiPage wikipage = wikiContext.getPage();
     WikiPage latestversion = wiki.getPage( pagereq );
@@ -160,7 +160,7 @@
         modifiedPage.setAuthor( storedUser );
 
         if( changenote != null )
-            modifiedPage.setAttribute( WikiPage.CHANGENOTE, changenote );
+            modifiedPage.setAttribute( WikiPage.CHANGENOTE, TextUtil.replaceEntities( changenote
) );
         else
             modifiedPage.removeAttribute( WikiPage.CHANGENOTE );
         

Modified: incubator/jspwiki/trunk/src/webdocs/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Edit.jsp?rev=1433618&r1=1433617&r2=1433618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Edit.jsp Tue Jan 15 20:34:08 2013
@@ -62,8 +62,8 @@
     String cancel  = request.getParameter("cancel");
     String append  = request.getParameter("append");
     String edit    = request.getParameter("edit");
-    String author  = TextUtil.replaceEntities( findParam( pageContext, "author" ) );
-    String changenote = TextUtil.replaceEntities( findParam( pageContext, "changenote" )
);
+    String author  = findParam( pageContext, "author" );
+    String changenote = findParam( pageContext, "changenote" );
     String text    = EditorManager.getEditedText( pageContext );
     String link    = TextUtil.replaceEntities( findParam( pageContext, "link") );
     String spamhash = findParam( pageContext, SpamFilter.getHashFieldName(request) );
@@ -159,7 +159,7 @@
 
         if( changenote != null && changenote.length() > 0 )
         {
-            modifiedPage.setAttribute( WikiPage.CHANGENOTE, changenote );
+            modifiedPage.setAttribute( WikiPage.CHANGENOTE, TextUtil.replaceEntities(changenote)
);
         }
         else
         {

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=1433618&r1=1433617&r2=1433618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Tue Jan 15 20:34:08
2013
@@ -242,7 +242,7 @@
          <td class="changenote">
            <%
               String changeNote = (String)currentPage.getAttribute( WikiPage.CHANGENOTE );
-              changeNote = (changeNote != null) ? TextUtil.replaceEntities( changeNote )
: "" ;
+              changeNote = (changeNote != null) ? changeNote : "" ;
            %>
            <%= changeNote %>
          </td>



Mime
View raw message