Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.209 -r1.210
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	22 Mar 2012 10:42:55 -0000	1.209
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	26 Mar 2012 10:33:22 -0000	1.210
@@ -847,7 +847,7 @@
     set fn [my get_from_value $value name $value]
     set href [$package_id pretty_link -download 1 -parent_id $entry_info(parent_id) $entry_info(name)]
     if {![my istype image]} {
-      set href [export_vars -base $href [list [list filename $fn]]]
+      append href ?filename=[ns_urlencode $fn]
     }
     #
     # The HTML5 handling of "required" would force us to upload in
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.177 -r1.178
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	2 Mar 2012 13:44:52 -0000	1.177
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	26 Mar 2012 10:33:22 -0000	1.178
@@ -1504,7 +1504,7 @@
     my get_parameters
     my instvar __including_page
     set digg_link [export_vars -base "http://digg.com/submit" {
-      {phase 2} 
+      {phase 2}
       {url       $url}
       {title     "[string range [$__including_page title] 0 74]"}
       {body_text "[string range $description 0 349]"}
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.87 -r1.88
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	22 Mar 2012 10:42:55 -0000	1.87
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	26 Mar 2012 10:33:22 -0000	1.88
@@ -304,9 +304,12 @@
       }
     }
     if {[my exists extra_query_parameter]} {
-      set internal_href [export_vars -base $internal_href [my extra_query_parameter]]
-      set internal_href [string map [list ' "'"] $internal_href]
-      if {[my exists revision_id]} {append href &revision_id=[my revision_id]}
+      set pairs {}
+      foreach {pair} [my extra_query_parameter] {
+	lappend pairs [lindex $pair 0]=[ns_urlencode [lindex $pair 1]]
+      }
+      append internal_href ?[string map [list ' "'"] [join $pairs &]]
+      if {[my exists revision_id]} {append internal_href &revision_id=[my revision_id]}
     } else {
       if {[my exists revision_id]} {append internal_href ?revision_id=[my revision_id]}
     }