Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v
diff -u -r1.3.2.15 -r1.3.2.16
--- openacs-4/packages/xowf/tcl/xowf-procs.tcl	22 Apr 2017 16:59:39 -0000	1.3.2.15
+++ openacs-4/packages/xowf/tcl/xowf-procs.tcl	2 May 2017 13:51:25 -0000	1.3.2.16
@@ -1329,7 +1329,7 @@
 
   WorkflowPage instproc create-or-use_view {-package_id:required -parent_id:required name } {
     # the link should be able to view return_url and template_file
-    set path [export_vars -base [$package_id pretty_link -parent_id $parent_id $lang:$stripped_name] {}]
+    set path [export_vars -no_base_encode -base [$package_id pretty_link -parent_id $parent_id $lang:$stripped_name] {}]
     return [$package_id returnredirect $path]
   }
   
@@ -1392,7 +1392,7 @@
           #
           if {$m eq ""} {
             return [$package_id returnredirect \
-                        [export_vars -base [$package_id pretty_link -parent_id $parent_id $lang:$stripped_name] \
+                        [export_vars -no_base_encode -base [$package_id pretty_link -parent_id $parent_id $lang:$stripped_name] \
                              [list return_url template_file]]]
           } else {
             set item [::xo::db::CrClass get_instance_from_db -item_id $id]
Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -r1.33.2.11 -r1.33.2.12
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	21 Apr 2017 13:51:54 -0000	1.33.2.11
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	2 May 2017 13:51:25 -0000	1.33.2.12
@@ -628,18 +628,18 @@
           #               [list item_id [$c item_id]] \
           #               [list name [$c pretty_link]] return_url]]
       
-      set delete_link [export_vars -base $page_link {{m delete} return_url}]
+      set delete_link [export_vars -no_base_encode -base $page_link {{m delete} return_url}]
       
       $t add \
           -ID [$c name] \
           -name $prettyName \
-          -name.href [export_vars -base $page_link {template_file html-content}] \
+          -name.href [export_vars -no_base_encode -base $page_link {template_file html-content}] \
           -name.title [$c set title] \
           -object_type $icon(text) \
           -object_type.richtext $icon(is_richtext) \
           -last_modified [$c set last_modified] \
           -edit "" \
-          -edit.href [export_vars -base $page_link {{m edit} return_url}] \
+          -edit.href [export_vars -no_base_encode -base $page_link {{m edit} return_url}] \
           -edit.title #xowiki.edit# \
           -mod_user [::xo::get_user_name [$c set creation_user]] \
           -delete "" \
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.248.2.51 -r1.248.2.52
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	27 Apr 2017 18:18:24 -0000	1.248.2.51
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	2 May 2017 13:51:25 -0000	1.248.2.52
@@ -1137,7 +1137,7 @@
       #
       if {[my cleanup]} {
         set return_url [$package_id query_parameter "return_url" [$parent_id pretty_link]]
-        $package_id returnredirect [export_vars -base [$object pretty_link] [list {m delete} return_url]]
+        $package_id returnredirect [export_vars -no_base_encode -base [$object pretty_link] [list {m delete} return_url]]
       }
     }
   }
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.200.2.30 -r1.200.2.31
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	21 Apr 2017 13:51:54 -0000	1.200.2.30
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	2 May 2017 13:51:25 -0000	1.200.2.31
@@ -4026,7 +4026,7 @@
       set page_link [$p pretty_link]
 
       if {[info exists wf]} {
-        set view_link [export_vars -base $wf_link {{m create-or-use} {p.form "[$p name]"}}]
+        set view_link [export_vars -no_base_encode -base $wf_link {{m create-or-use} {p.form "[$p name]"}}]
       } else {
         set view_link $page_link
       }
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 -r1.134.2.8 -r1.134.2.9
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	22 Apr 2017 17:34:04 -0000	1.134.2.8
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	2 May 2017 13:51:25 -0000	1.134.2.9
@@ -698,7 +698,7 @@
       set return_url [$data query_parameter return_url]
     }
     set link [$data pretty_link]
-    my submit_link [export_vars -base $link {{m edit} page_template return_url item_id}]
+    my submit_link [export_vars -no_base_encode -base $link {{m edit} page_template return_url item_id}]
     # my log "-- submit_link = [my submit_link]"
   }
 
@@ -736,7 +736,7 @@
     set item_id [next]
 
     set link [$data pretty_link]
-    my submit_link [export_vars -base $link {{m edit} $__vars}]
+    my submit_link [export_vars -no_base_encode -base $link {{m edit} $__vars}]
     # my log "-- submit_link = [my submit_link]"
     return $item_id
   }
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -r1.36.2.5 -r1.36.2.6
--- openacs-4/packages/xowiki/www/admin/list.tcl	27 Mar 2017 07:33:18 -0000	1.36.2.5
+++ openacs-4/packages/xowiki/www/admin/list.tcl	2 May 2017 13:51:25 -0000	1.36.2.6
@@ -134,7 +134,7 @@
               -syndicated [info exists syndicated($revision_id)] \
               -size [expr {$content_length ne "" ? $content_length : 0}]  \
               -edit "" \
-              -edit.href [export_vars -base $page_link {{m edit} return_url}] \
+              -edit.href [export_vars -no_base_encode -base $page_link {{m edit} return_url}] \
               -edit.title #xowiki.edit# \
               -mod_user [::xo::get_user_name $creation_user] \
               -delete "" \
Index: openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/weblog-mini-calendar.tcl,v
diff -u -r1.18.2.8 -r1.18.2.9
--- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl	14 Feb 2017 08:38:17 -0000	1.18.2.8
+++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl	2 May 2017 13:51:25 -0000	1.18.2.9
@@ -84,13 +84,13 @@
   set prev_month_url ""
 } else {
   set prev_month     [clock format $prev_mon -format "%Y-%m-%d"]
-  set prev_month_url [export_vars -base $base_url {{date $prev_month} page_num summary}]
+  set prev_month_url [export_vars -no_base_encode -base $base_url {{date $prev_month} page_num summary}]
 }
 if {$next_mon > [clock scan $latest_date]} {
   set next_month_url ""
 } else {
   set next_month     [clock format $next_mon -format "%Y-%m-%d"]
-  set next_month_url [export_vars -base $base_url {{date $next_month} page_num summary}]
+  set next_month_url [export_vars -no_base_encode -base $base_url {{date $next_month} page_num summary}]
 }
 
 
@@ -154,7 +154,7 @@
   } else {
     set class inactive
   }
-  set url [export_vars -base $base_url {{date $ansi_date} summary}]
+  set url [export_vars -no_base_encode -base $base_url {{date $ansi_date} summary}]
   
   set id minicalendar-$ansi_date
   if {$count ne ""} {
@@ -179,7 +179,7 @@
 
 
 set sysdate [dt_sysdate]
-set today_url [export_vars -base $base_url {{date $sysdate} page_num}]
+set today_url [export_vars -no_base_encode -base $base_url {{date $sysdate} page_num}]
 if {$sysdate eq $date} {
   set today_p t
 } else {