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.94 -r1.368.2.95
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	30 Jul 2021 13:43:17 -0000	1.368.2.94
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	2 Aug 2021 14:45:02 -0000	1.368.2.95
@@ -1171,7 +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
 
@@ -1367,6 +1367,7 @@
           } {
           #:log "=== no return_url specified, using [::xo::cc url] or [[::${:package_id} context] url]"
           set return_url [::xo::cc url]
+          set return_url [ad_urlencode_url $return_url]
         }
       }
       set m [:form_parameter __form_redirect_method "edit"]