Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.368.2.97 -r1.368.2.98
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	2 Sep 2021 13:24:29 -0000	1.368.2.97
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	28 Sep 2021 20:15:10 -0000	1.368.2.98
@@ -36,8 +36,7 @@
       :log "bulk-delete: DELETE item_id $item_id"
       ${:package_id} www-delete -item_id $item_id
     }
-
-    ${:package_id} returnredirect [:query_parameter return_url:localurl [:pretty_link]]
+    :return_redirect_without_params
   }
 
   #
@@ -66,8 +65,8 @@
       ns_log notice "HEADERS: got X-Requested-With"
       return OK
     } else {
-      ns_log notice "HEADERS: no X-Requested-With"
-      ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
+      #ns_log notice "HEADERS: no X-Requested-With"
+      :return_redirect_without_params
     }
   }
 
@@ -81,7 +80,7 @@
 
   } {
     ::xowiki::clipboard clear
-    ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
+    :return_redirect_without_params
   }
 
   #
@@ -105,7 +104,7 @@
         }
       }
     }
-    ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
+    :return_redirect_without_params
   }
 
   #
@@ -135,7 +134,7 @@
                  -parent_id $folder_id -objects $item_ids]
     util_user_message -html -message $msg
     ::xowiki::clipboard clear
-    ::${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
+    :return_redirect_without_params
   }
 
   #
@@ -155,6 +154,15 @@
     ad_script_abort
   }
 
+  Page instproc return_redirect_without_params {} {
+    #
+    # Return to [xo::cc url], the current URL without query
+    # parameters.
+    #
+    ::${:package_id} returnredirect \
+        [:query_parameter return_url:localurl [ad_urlencode_folder_path [::xo::cc url]]]
+  }
+
   #
   # Externally callable method: duplicate
   #