Return-Path: X-Original-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 50AA29313 for ; Sat, 14 Apr 2012 12:31:31 +0000 (UTC) Received: (qmail 40343 invoked by uid 500); 14 Apr 2012 12:31:31 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 40327 invoked by uid 500); 14 Apr 2012 12:31:31 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 40320 invoked by uid 99); 14 Apr 2012 12:31:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Apr 2012 12:31:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Apr 2012 12:31:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D3B3D23888EA; Sat, 14 Apr 2012 12:31:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1326095 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/webdocs/Delete.jsp Date: Sat, 14 Apr 2012 12:31:07 -0000 To: jspwiki-commits@incubator.apache.org From: metskem@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120414123107.D3B3D23888EA@eris.apache.org> 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 * 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 + + * 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 *

* 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 )