Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -N -r1.6.8.5 -r1.6.8.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	9 Sep 2013 16:44:25 -0000	1.6.8.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	9 Sep 2013 17:25:31 -0000	1.6.8.6
@@ -44,7 +44,7 @@
 set javascript "onload=\"javascript:document.check_checkbox()\""
 
 
-set parent_link ".?[export_url_vars expand:multiple root_id=$parent_id]"
+set parent_link ".?[export_vars -url {expand:multiple {root_id $parent_id}}]"
 
 set page_title "Build Your Site Map "
 set context [list [list "." "Site Map"] $page_title]
@@ -53,7 +53,7 @@
 
 db_foreach path_select {} {
     if {$node_id != $root_id && $admin_p eq "t"} {
-	append head "<a href=.?[export_url_vars expand:multiple root_id=$node_id]>"
+	append head "<a href=.?[export_vars -url {expand:multiple {root_id $node_id}}]>"
     }
     if {$name eq ""} {
 	append head "$obj_name:"
@@ -183,10 +183,10 @@
     if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue } 
         
     if {$directory_p eq "t"} {
-	set add_folder_url "?[export_url_vars expand:multiple root_id node_id new_parent=$node_id new_type=folder]"
+	set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
 	if {$object_id eq ""} {
 	    set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
-	    set new_app_url "?[export_url_vars expand:multiple root_id new_application=$node_id]"
+	    set new_app_url "?[export_vars -url {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} {
@@ -196,7 +196,7 @@
 	    # Add a link to control permissioning
 	    if {$object_admin_p} {
 		set permissions_url "../../permissions/one?[export_vars -url {object_id}]"
-		set rename_url "?[export_url_vars expand:multiple root_id rename_application=$node_id]"
+		set rename_url "?[export_vars -url {expand:multiple root_id {rename_application $node_id}}]"
 		set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
 	    }
 	    # Is the object a package?
@@ -247,7 +247,7 @@
 	set expand_url ""
     }
     
-    set name_url [export_url_vars expand:multiple root_id=$node_id]
+    set name_url [export_vars -url {expand:multiple {root_id $node_id}}]
         
     set action_type 0
     set action_form_part ""