Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -N -r1.134.2.9 -r1.134.2.10
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	2 May 2017 13:51:25 -0000	1.134.2.9
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	3 May 2017 07:12:52 -0000	1.134.2.10
@@ -697,8 +697,9 @@
     if {[$data exists_query_parameter return_url]} {
       set return_url [$data query_parameter return_url]
     }
-    set link [$data pretty_link]
-    my submit_link [export_vars -no_base_encode -base $link {{m edit} page_template return_url item_id}]
+    set submit_link [$data pretty_link -query [export_vars {
+      {m edit} page_template return_url item_id
+    }]]
     # my log "-- submit_link = [my submit_link]"
   }