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 -r1.368.2.95 -r1.368.2.96
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	2 Aug 2021 14:45:02 -0000	1.368.2.95
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	7 Aug 2021 09:43:42 -0000	1.368.2.96
@@ -67,7 +67,7 @@
       return OK
     } else {
       ns_log notice "HEADERS: no X-Requested-With"
-      ${:package_id} returnredirect [:query_parameter return_url:localurl [::xo::cc url]]
+      ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
     }
   }
 
@@ -81,7 +81,7 @@
 
   } {
     ::xowiki::clipboard clear
-    ${:package_id} returnredirect [:query_parameter return_url:localurl [::xo::cc url]]
+    ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #
@@ -105,7 +105,7 @@
         }
       }
     }
-    ${:package_id} returnredirect [:query_parameter return_url:localurl [::xo::cc url]]
+    ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #
@@ -135,7 +135,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 [::xo::cc url]]
+    ::${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #
@@ -488,7 +488,7 @@
       :save
       #:msg "ok $msg"
     }
-    ::${:package_id} returnredirect [::xo::cc url]
+    ::${:package_id} returnredirect [ad_return_url]
   }
 
 
@@ -1524,7 +1524,7 @@
       return [:www-view [:include [list child-resources -publish_status all]]]
     }
     #:msg "method list undefined for this kind of object"
-    ${:package_id} returnredirect [::xo::cc url]
+    ${:package_id} returnredirect [ad_return_url]
   }
 
   #
@@ -1782,7 +1782,7 @@
         [:form_parameter new_tags]
 
     ::${:package_id} returnredirect \
-        [:query_parameter return_url:localurl [::${:package_id} url]]
+        [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #