Author: metskem
Date: Sat Apr 14 12:31:07 2012
New Revision: 1326095
URL: http://svn.apache.org/viewvc?rev=1326095&view=rev
Log:
2012-04-14 Harry Metske <[email protected]>
* 2.8.5-svn-12
* fixed JSPWIKI-725 Return to original page attachments list after
deleting one attachment
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/Delete.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=1326095&r1=1326094&r2=1326095&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sat Apr 14 12:31:07
2012
@@ -1,3 +1,9 @@
+2012-04-14 Harry Metske <[email protected]>
+
+ * 2.8.5-svn-12
+
+ * fixed JSPWIKI-725 Return to original page attachments list after
deleting one attachment
+
2012-03-25 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.8.5-svn-11
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=1326095&r1=1326094&r2=1326095&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
Sat Apr 14 12:31:07 2012
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "11";
+ public static final String BUILD = "12";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/Delete.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/Delete.jsp?rev=1326095&r1=1326094&r2=1326095&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/Delete.jsp
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/Delete.jsp Sat
Apr 14 12:31:07 2012
@@ -48,7 +48,7 @@
session.setAttribute( BreadcrumbsTag.BREADCRUMBTRAIL_KEY, trail );
}
- response.sendRedirect(wikiContext.getURL( WikiContext.VIEW, pagereq )
);
+ response.sendRedirect(wiki.getURL( WikiContext.INFO, redirTo, null,
false ));
return;
}
else if( delete != null )
