Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -N -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	10 Sep 2015 10:08:02 -0000	1.30.2.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	10 Sep 2015 10:15:46 -0000	1.30.2.3
@@ -42,7 +42,7 @@
     set javascript ""
 }
 
-set parent_link [export_vars {expand:multiple {root_id $parent_id}}]
+set parent_link [export_vars -base . {expand:multiple {root_id $parent_id}}]
 
 set doc(title) [_ acs-subsite.Site_Map]
 set context [list $doc(title)]
@@ -65,7 +65,7 @@
 
 db_foreach path_select {} {
     if {$node_id != $root_id && $admin_p == "t"} {
-        append head [subst {<a href="[ns_quotehtml [export_vars {expand:multiple {root_id $node_id}}]]">}]
+        append head [subst {<a href="[ns_quotehtml [export_vars -base . {expand:multiple {root_id $node_id}}]]">}]
     }
     if {$name eq ""} {
         append head "$obj_name:"
@@ -209,20 +209,20 @@
     if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue }
 
     if {$directory_p == "t"} {
-        set add_folder_url [export_vars {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]
+        set add_folder_url [export_vars -base . {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]
         if {$object_id eq ""} {
             set mount_url [export_vars -base mount {expand:multiple root_id node_id}]
             set new_app_url [export_vars {expand:multiple root_id {new_application $node_id}}]
         } else {
             # This makes sure you can't unmount the thing that is serving the page you're looking at.
             if {[ad_conn node_id] != $node_id} {
-                set unmount_url [export_vars {expand:multiple root_id node_id}]
+                set unmount_url [export_vars -base unmount {expand:multiple root_id node_id}]
             }
 
             # Add a link to control permissioning
             if {$object_admin_p} {
                 set permissions_url [export_vars -base "../../permissions/one" {object_id}]
-                set rename_url [export_vars {expand:multiple root_id {rename_application $node_id}}]
+                set rename_url [export_vars -base . {expand:multiple root_id {rename_application $node_id}}]
                 set delete_url [export_vars -base instance-delete {{package_id $object_id} root_id}]
             }
             # Is the object a package?
@@ -268,7 +268,7 @@
         set expand_url ""
     }
 
-    set name_url [export_vars {expand:multiple {root_id $node_id}}]
+    set name_url [export_vars -base . {expand:multiple {root_id $node_id}}]
 
     set action_type 0
     set action_form_part ""