Author: metskem
Date: Sun Aug 31 04:44:38 2008
New Revision: 690679
URL: http://svn.apache.org/viewvc?rev=690679&view=rev
Log:
2.7.0-alpha-35 JSPWIKI-364: Info tab presents null string to user (reported by
Florian)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/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=690679&r1=690678&r2=690679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 31 04:44:38 2008
@@ -1,3 +1,9 @@
+2008-08-31 Harry Metske <[EMAIL PROTECTED]>
+
+ * 2.7.0-alpha-35
+
+ * JSPWIKI-364: Info tab presents null string to user (reported by
Florian)
+
2008-08-31 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.7.0-alpha-34
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=690679&r1=690678&r2=690679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Aug 31
04:44:38 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "34";
+ public static final String BUILD = "35";
/**
* 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=690679&r1=690678&r2=690679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Sun
Aug 31 04:44:38 2008
@@ -3,6 +3,7 @@
<%@ page import="com.ecyrd.jspwiki.auth.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
<%@ page import="com.ecyrd.jspwiki.attachment.*" %>
+<%@ page import="com.ecyrd.jspwiki.i18n.InternationalizationManager" %>
<%@ page import="java.security.Permission" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
@@ -26,7 +27,16 @@
if( firstPage != null )
{
creationAuthor = firstPage.getAuthor();
- }
+
+ if( creationAuthor != null && creationAuthor.length() > 0 )
+ {
+ creationAuthor = TextUtil.replaceEntities(creationAuthor);
+ }
+ else
+ {
+ creationAuthor = c.getBundle(
InternationalizationManager.CORE_BUNDLE ).getString( "common.unknownauthor" );
+ }
+ }
int itemcount = 0; //number of page versions
try
