Author: metskem
Date: Sun Jan 31 18:19:17 2010
New Revision: 905090
URL: http://svn.apache.org/viewvc?rev=905090&view=rev
Log:
JSPWIKI-633: TextUtil.replaceEntities done multiple times, reported by Stefan
Bohn.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/templates/default_nl.properties
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=905090&r1=905089&r2=905090&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sun Jan 31 18:19:17
2010
@@ -1,3 +1,9 @@
+2010-01-31 Harry Metske <[email protected]>
+
+ * 2.8.4-svn-8
+
+ * JSPWIKI-633: TextUtil.replaceEntities done multiple times, reported
by Stefan Bohn.
+
2010-01-20 Janne Jalkanen <[email protected]>
* 2.8.4-svn-7
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/templates/default_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/templates/default_nl.properties?rev=905090&r1=905089&r2=905090&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/templates/default_nl.properties
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/templates/default_nl.properties
Sun Jan 31 18:19:17 2010
@@ -229,7 +229,7 @@
info.uploadnew.filename=Selecteer het bestand:
info.uploadnew.changenote=Opmerkingen:
info.uploadnew.help=Om een nieuwe bijlage aan deze pagina toe te voegen, \
- Gebruik volgend invoer veld om het bestand te selecteren, en klik de
“Bewaar op de server” knop.
+ Gebruik volgend invoer veld om het bestand te selecteren, en klik de
“Plaats het bestand op de server” knop.
info.uploadnew.nopermission=Enkel geautoriseerde gebruikers kunnen nieuwe
attachment versies toevoegen
info.deleteattachment=Verwijder bijlage
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=905090&r1=905089&r2=905090&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
Sun Jan 31 18:19:17 2010
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "7";
+ public static final String BUILD = "8";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java?rev=905090&r1=905089&r2=905090&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
Sun Jan 31 18:19:17 2010
@@ -624,6 +624,10 @@
else if( item.getFieldName().equals("changenote") )
{
changeNote = item.getString("UTF-8");
+ if (changeNote != null)
+ {
+ changeNote = TextUtil.replaceEntities(changeNote);
+ }
}
else if( item.getFieldName().equals( "nextpage" ) )
{
@@ -837,7 +841,6 @@
{
public long m_currentBytes;
public long m_totalBytes;
- public String m_uid;
public void update(long recvdBytes, long totalBytes, int item)
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=905090&r1=905089&r2=905090&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
Sun Jan 31 18:19:17 2010
@@ -214,7 +214,7 @@
{
String changenote =
(String)pageref.getAttribute(WikiPage.CHANGENOTE);
- row.addElement( new td(changenote != null ?
TextUtil.replaceEntities(changenote) : "").setClass("changenote") );
+ row.addElement( new td(changenote != null ? changenote :
"").setClass("changenote") );
}
// Revert note
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp?rev=905090&r1=905089&r2=905090&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
Sun Jan 31 18:19:17 2010
@@ -121,7 +121,7 @@
</wiki:Permission>
<td class="changenote">
<%
- String changeNote =
TextUtil.replaceEntities((String)att.getAttribute(WikiPage.CHANGENOTE));
+ String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
if( changeNote != null ) {
%><%=changeNote%><%
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp?rev=905090&r1=905089&r2=905090&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
Sun Jan 31 18:19:17 2010
@@ -222,7 +222,7 @@
<td class="changenote">
<%
String changeNote = (String)currentPage.getAttribute(
WikiPage.CHANGENOTE );
- changeNote = (changeNote != null) ? TextUtil.replaceEntities(
changeNote ) : "" ;
+ changeNote = (changeNote != null) ? changeNote : "" ;
%>
<%= changeNote %>
</td>
@@ -378,7 +378,7 @@
<%
String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
if( changeNote != null ) {
- changeNote = TextUtil.replaceEntities(changeNote);
+ changeNote = changeNote;
%><%=changeNote%><%
}
%>
