r1360 - xwiki/trunk/src/main/java/com/xpn/xwiki/web

[Marta Girdea]

Author: marta_girdea
Date: 2006-10-04 13:25:08 +0200 (Wed, 04 Oct 2006)
New Revision: 1360

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/web/SaveAndContinueAction.java
Log:
Remove the query parameters needed only on document initialization when returning from SaveAndContinue. Otherwise, a "Document already exists" exception will be thrown.


Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/SaveAndContinueAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/SaveAndContinueAction.java	2006-10-04 10:53:29 UTC (rev 1359)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/SaveAndContinueAction.java	2006-10-04 11:25:08 UTC (rev 1360)
@@ -39,6 +39,20 @@
 			if (back == null || back.equals("")) {
 				back = context.getDoc().getURL("edit", context);
 			}
+            else{
+                int qm = back.indexOf('?');
+                String base = back.substring(0, qm != -1 ? qm : back.length());
+                String query = "";
+                int start = back.indexOf("editor=");
+                if(start != -1){
+                    int end = back.indexOf('&', start);
+                    if(end == -1){
+                        end = back.length();
+                    }
+                    query = query + back.substring(start, end);
+                }
+                back = base + "?" + query;
+            }
 		}
 
 		if (back != null && back.indexOf("editor=class") >= 0) {