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.327.2.32 -r1.327.2.33
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	2 May 2017 13:19:34 -0000	1.327.2.32
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	2 May 2017 13:30:55 -0000	1.327.2.33
@@ -1040,7 +1040,7 @@
         }
       }
       set m [my form_parameter __form_redirect_method "edit"]
-      set url [export_vars -base [my action_url] {m return_url}]
+      set url [export_vars -no_base_encode -base [my action_url] {m return_url}]
       #my log "=== setting action <$url> for form-action my-name [my name]"
       $formNode setAttribute action $url method POST role form
       if {$has_file} {$formNode setAttribute enctype multipart/form-data}