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]}
     }