Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.332.2.119 -r1.332.2.120
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	14 Aug 2022 06:31:20 -0000	1.332.2.119
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	17 Aug 2022 17:06:56 -0000	1.332.2.120
@@ -2992,6 +2992,12 @@
     ::xo::db::sql::content_revision del -revision_id $revision_id
   }
 
+  Package instproc query_parameter_return_url {default} {
+    return [:query_parameter "return_url:localurl" \
+                [:query_parameter "local_return_url:localurl" \
+                     $default]]
+  }
+
   Package ad_instproc www-delete {-item_id -name -parent_id -return_url} {
 
     This web-callable "delete" method does not require an instantiated object,
@@ -3019,7 +3025,7 @@
     }
 
     if {![info exists return_url]} {
-      set return_url [:query_parameter return_url:localurl \
+      set return_url [:query_parameter_return_url \
                           [ad_urlencode_folder_path ${:package_url}]]
     }
 
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.126 -r1.368.2.127
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	11 Aug 2022 18:22:29 -0000	1.368.2.126
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	17 Aug 2022 17:06:56 -0000	1.368.2.127
@@ -1598,17 +1598,16 @@
     the parameter "local_return_url".
 
   } {
-    set page_id [:query_parameter "revision_id"]
+    set page_id [:query_parameter revision_id]
     if {[string is integer -strict $page_id]} {
       set revision_id $page_id
     } else {
       set revision_id ${:revision_id}
     }
     #:log "--M set_live_revision $revision_id"
     :set_live_revision -revision_id $revision_id
-    ${:package_id} returnredirect [:query_parameter "return_url" \
-                                       [:query_parameter "local_return_url" \
-                                            [export_vars -base [::${:package_id} url] {{m revisions}}]]]
+    ${:package_id} returnredirect [:query_parameter_return_url \
+                                       [export_vars -base [::${:package_id} url] {{m revisions}}]]
   }
 
   #