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.93 -r1.368.2.94
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	27 Jul 2021 10:36:59 -0000	1.368.2.93
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	30 Jul 2021 13:43:17 -0000	1.368.2.94
@@ -1171,6 +1171,7 @@
           # with highest precedence
           #
           set return_url [::${:package_id} query_parameter return_url:localurl $url]
+          set return_url [ad_urlencode_url $return_url]
           #:log "${:name}: url=$url, return_url=$return_url"
           ::${:package_id} returnredirect $return_url