Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl 27 Oct 2014 16:39:50 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl 27 Jun 2015 16:47:27 -0000 1.7 @@ -77,7 +77,7 @@ and t.object_type = a.ancestor_type order by type_level } { - set one_attribute_url [export_vars -url -base "../attributes/one" {attribute_id return_url}] + set one_attribute_url [export_vars -base "../attributes/one" {attribute_id return_url}] } @@ -94,8 +94,8 @@ # See if we need to offer a link to add a rel type set more_relation_types_p [rel_types::additional_rel_types_p -group_type $group_type] -set add_group_url [export_vars -url -base "../parties/new" {{party_type $group_type} {add_with_rel_type composition_rel} return_url}] +set add_group_url [export_vars -base "../parties/new" {{party_type $group_type} {add_with_rel_type composition_rel} return_url}] -set add_attribute_url [export_vars -url -base "../attributes/add" {{object_type $group_type} return_url}] +set add_attribute_url [export_vars -base "../attributes/add" {{object_type $group_type} return_url}] Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 27 Apr 2015 15:28:18 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 27 Jun 2015 16:47:27 -0000 1.6 @@ -67,7 +67,7 @@ set role_pretty_name [lang::util::localize $role_pretty_name] set role_pretty_plural [lang::util::localize $role_pretty_plural] - set elements_display_url [export_vars -url -base "elements-display" {group_id rel_type}] - set relations_add_url [export_vars -url -base "../relations/add" {group_id rel_type {return_url $return_url}}] + set elements_display_url [export_vars -base "elements-display" {group_id rel_type}] + set relations_add_url [export_vars -base "../relations/add" {group_id rel_type {return_url $return_url}}] } Index: openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl 27 Oct 2014 16:39:54 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl 27 Jun 2015 16:47:27 -0000 1.5 @@ -21,7 +21,7 @@ set context [list "Add relation type"] set constraint_id [db_nextval "acs_object_id_seq"] set export_form_vars [export_vars -form {constraint_id object_type return_url}] -set export_url_vars [export_vars -url {constraint_id object_type return_url}] +set export_url_vars [export_vars {constraint_id object_type return_url}] db_multirow primary_rels select_primary_relations { select o.object_type as rel_type, o.pretty_name 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 -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 27 Jun 2015 16:03:13 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 27 Jun 2015 16:47:27 -0000 1.10 @@ -184,10 +184,10 @@ if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue } if {$directory_p == "t"} { - set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]" + set add_folder_url "?[export_vars {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 -url {expand:multiple root_id {new_application $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} { @@ -197,7 +197,7 @@ # 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 -url {expand:multiple root_id {rename_application $node_id}}]" + set rename_url "?[export_vars {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? Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/acs-subsite/www/shared/community-member.tcl 27 Oct 2014 16:40:01 -0000 1.20 +++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl 27 Jun 2015 16:47:27 -0000 1.21 @@ -73,7 +73,7 @@ # Do we show the portrait? set inline_portrait_state "none" -set portrait_export_vars [export_vars -url {user_id}] +set portrait_export_vars [export_vars {user_id}] if {[db_0or1row portrait_info " select i.width, i.height, cr.title, cr.description, cr.publish_date Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/shared/portrait.tcl 27 Oct 2014 16:40:02 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl 27 Jun 2015 16:47:27 -0000 1.10 @@ -42,7 +42,7 @@ set doc(title) [_ acs-subsite.lt_Portrait_of_first_last] set context [list [list [acs_community_member_url -user_id $user_id] "$first_names $last_name"] [_ acs-subsite.Portrait]] -set export_vars [export_vars -url {user_id}] +set export_vars [export_vars {user_id}] set pretty_date [lc_time_fmt $publish_date "%q"] ad_return_template Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 27 Oct 2014 16:40:03 -0000 1.11 +++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 27 Jun 2015 16:47:27 -0000 1.12 @@ -45,8 +45,8 @@ set admin_p 0 } -set export_vars [export_vars -url {user_id}] -set export_edit_vars [export_vars -url {user_id return_url}] +set export_vars [export_vars {user_id}] +set export_edit_vars [export_vars {user_id return_url}] if {![db_0or1row user_info "select first_names,