Author: kbettinger
Date: 2010-05-20 15:53:59 +0200 (Thu, 20 May 2010)
New Revision: 42244
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
Log:
CMSC-1694
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
2010-05-20 13:15:27 UTC (rev 42243)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
2010-05-20 13:53:59 UTC (rev 42244)
@@ -65,7 +65,15 @@
}
objectNode.delete(true);
}
- ActionForward ret = new ActionForward(getParameter(request,
"returnurl")+"&fresh=true");
+ String returnurl = getParameter(request, "returnurl");
+
+ ActionForward ret;
+ if(returnurl.contains(".jsp?")) {
+ ret = new ActionForward(returnurl+"&fresh=true");
+ } else {
+ ret = new ActionForward(returnurl+"?fresh=true");
+ }
+
ret.setRedirect(true);
return ret;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
