You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2013/04/23 22:17:12 UTC
svn commit: r1471129 - in /incubator/jspwiki/trunk: ChangeLog
src/org/apache/wiki/Release.java
src/webdocs/templates/default/InfoContent.jsp
Author: brushed
Date: Tue Apr 23 20:17:11 2013
New Revision: 1471129
URL: http://svn.apache.org/r1471129
Log:
2.9.1-incubating-2
* JSPWIKI-775, fixing "null" change-notes in PageInfo.jsp.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
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=1471129&r1=1471128&r2=1471129&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Apr 23 20:17:11 2013
@@ -1,3 +1,9 @@
+2013-04-23 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.9.1-incubating-2
+
+ * JSPWIKI-775, fixing "null" change-notes in PageInfo.jsp.
+
2013-04-21 Harry Metske <me...@apache.org>
* 2.9.1-incubating-1
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=1471129&r1=1471128&r2=1471129&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Tue Apr 23 20:17:11 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 = "1";
+ public static final String BUILD = "2";
/**
* This is the generic version string you should use
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=1471129&r1=1471128&r2=1471129&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Tue Apr 23 20:17:11 2013
@@ -241,7 +241,8 @@
</td>
<td class="changenote">
- <%= (String)currentPage.getAttribute( WikiPage.CHANGENOTE ) %>
+ <% String changenote = (String) currentPage.getAttribute( WikiPage.CHANGENOTE ); %>
+ <%= (changenote==null) ? "" : changenote %>
</td>
</tr>
@@ -392,7 +393,8 @@
</wiki:Permission>
--%>
<td class='changenote'>
- <%= (String)att.getAttribute(WikiPage.CHANGENOTE) %>
+ <% String changenote = (String) att.getAttribute( WikiPage.CHANGENOTE ); %>
+ <%= (changenote==null) ? "" : changenote %>
</td>
</tr>
</wiki:HistoryIterator><%-- </wiki:AttachmentsIterator> --%>