Terry, can you please try this patch on the current SVN trunk? Might
work also on the 2.6 branch...
/Janne
Index: /Users/jalkanen/Eclipse/JSPWiki/src/webdocs/Edit.jsp
===================================================================
--- /Users/jalkanen/Eclipse/JSPWiki/src/webdocs/Edit.jsp (revision
658385)
+++ /Users/jalkanen/Eclipse/JSPWiki/src/webdocs/Edit.jsp (working copy)
@@ -114,7 +114,7 @@
log.info("Page changed, warning user.");
session.setAttribute( EditorManager.REQ_EDITEDTEXT,
EditorManager.getEditedText(pageContext) );
- response.sendRedirect( wiki.getURL(WikiContext.CONFLICT,
pagereq, null, false) );
+ response.sendRedirect( wiki.getURL(WikiContext.CONFLICT,
pagereq, null, true) );
return;
}
@@ -184,7 +184,7 @@
}
catch( DecisionRequiredException ex )
{
- String redirect = wikiContext.getURL
(WikiContext.VIEW,"ApprovalRequiredForPageChanges");
+ String redirect = wiki.getViewURL
("ApprovalRequiredForPageChanges");
response.sendRedirect( redirect );
return;
}
@@ -219,7 +219,7 @@
if( htmlText != null ) session.setAttribute
( EditorManager.REQ_EDITEDTEXT, text );
session.setAttribute("changenote", changenote != null ?
changenote : "" );
- response.sendRedirect( wiki.getURL
(WikiContext.PREVIEW,pagereq,null,false) );
+ response.sendRedirect( wiki.getURL
(WikiContext.PREVIEW,pagereq,null,true) );
return;
}
else if( cancel != null )
