Index: openacs-4/packages/categories/www/cadmin/category-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	8 Feb 2004 17:15:57 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	9 Feb 2004 19:51:44 -0000	1.6
@@ -23,4 +23,4 @@
     return
 }
 
-ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/category-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/cadmin/category-delete.tcl	8 Feb 2004 17:20:47 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/category-delete.tcl	9 Feb 2004 19:52:32 -0000	1.7
@@ -41,11 +41,11 @@
 set page_title "Delete categories"
 
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
-lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] "Delete categories"
+lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] "Delete categories"
 
 template::list::create \
     -name categories \
Index: openacs-4/packages/categories/www/cadmin/category-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-form.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/category-form.tcl	1 Feb 2004 19:12:51 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/category-form.tcl	9 Feb 2004 19:51:44 -0000	1.4
@@ -28,11 +28,11 @@
 set tree_name $tree(tree_name)
 
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}]" "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}]" "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
-lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}]" $tree_name] $page_title
+lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}]" $tree_name] $page_title
 
 set languages [db_list_of_lists get_ad_locales ""]
 
@@ -56,7 +56,7 @@
 } -edit_data {
     category::update -category_id $category_id -locale $language -name $name -description $description
 } -after_submit {
-    ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+    ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
     ad_script_abort
 }
 
Index: openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl	9 Feb 2004 19:51:44 -0000	1.2
@@ -55,7 +55,7 @@
     set backward_exists_p [info exists backward_links($link_category_id)]
 
     template::multirow append tree $link_category_name $link_category_id $forward_exists_p $backward_exists_p \
-	[category::repeat_string " " [expr ($level-1)*5]] \
+	[category::indent_html [expr ($level-1)*5]] \
 	[export_vars -no_empty -base category-links-view {{category_id $link_category_id} {tree_id $link_tree_id} locale object_id}] \
 	[export_vars -no_empty -base category-link-add-3 {link_category_id category_id tree_id locale object_id}] \
 	[export_vars -no_empty -base category-link-add-4 {link_category_id category_id tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl	9 Feb 2004 19:51:44 -0000	1.2
@@ -24,4 +24,4 @@
     return
 }
 
-ad_returnredirect [export_vars -base category-links-view {category_id tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl	9 Feb 2004 19:51:44 -0000	1.2
@@ -28,4 +28,4 @@
     return
 }
 
-ad_returnredirect [export_vars -base category-links-view {category_id tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	9 Feb 2004 19:51:44 -0000	1.2
@@ -24,4 +24,4 @@
     return
 }
 
-ad_returnredirect [export_vars -base category-links-view {category_id tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/category-link-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-delete.tcl	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-delete.tcl	9 Feb 2004 19:51:44 -0000	1.2
@@ -31,7 +31,7 @@
 if {[info exists object_id]} {
     set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
 lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] [list [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id}] "Links to $category_name"] "Delete Links"
 
Index: openacs-4/packages/categories/www/cadmin/category-phase-in.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-in.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	1 Feb 2004 19:12:51 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	9 Feb 2004 19:48:44 -0000	1.3
@@ -19,4 +19,4 @@
 }
 category_tree::flush_cache $tree_id
 
-ad_returnredirect [export_vars -base tree-view { tree_id locale object_id }]
+ad_returnredirect [export_vars -no_empty -base tree-view { tree_id locale object_id }]
Index: openacs-4/packages/categories/www/cadmin/category-phase-out.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-out.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	1 Feb 2004 19:12:51 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	9 Feb 2004 19:48:44 -0000	1.4
@@ -29,4 +29,4 @@
     category_tree::flush_cache $tree_id
 }
 
-ad_returnredirect [export_vars -base tree-view { tree_id locale object_id }]
+ad_returnredirect [export_vars -no_empty -base tree-view { tree_id locale object_id }]
Index: openacs-4/packages/categories/www/cadmin/category-set-parent-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/category-set-parent-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/category-set-parent-2.tcl	1 Feb 2004 19:12:51 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/category-set-parent-2.tcl	9 Feb 2004 19:51:44 -0000	1.3
@@ -16,4 +16,4 @@
 
 category::change_parent -tree_id $tree_id -category_id $category_id -parent_id $parent_id
 
-ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/category-usage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/category-usage.tcl	1 Feb 2004 19:12:51 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/category-usage.tcl	9 Feb 2004 19:51:44 -0000	1.4
@@ -34,14 +34,14 @@
 set tree_name $tree(tree_name)
 set category_name [category::get_name $category_id $locale]
 set page_title "Objects using category \"$category_name\" of tree \"$tree_name\""
-set url_vars [export_vars {category_id tree_id locale object_id}]
+set url_vars [export_vars -no_empty {category_id tree_id locale object_id}]
 
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
-lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] "\"$category_name\" Usage"
+lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] "\"$category_name\" Usage"
 
 set table_def {
     {object_name "Object Name" {upper(n.object_name) $order} {<td><a href="/o/$object_id">$object_name</a></td>}}
Index: openacs-4/packages/categories/www/cadmin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/cadmin/index.tcl	8 Feb 2004 17:19:16 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/index.tcl	9 Feb 2004 19:51:44 -0000	1.7
@@ -11,14 +11,12 @@
     page_title:onevalue
     context_bar:onevalue
     locale:onevalue
-    url_vars:onevalue
     trees_with_write_permission:multirow
     trees_with_read_permission:multirow
 }
 
 set page_title "Category Management"
 set context_bar [list $page_title]
-set url_vars [export_vars {locale}]
 
 set user_id [ad_maybe_redirect_for_registration]
 set package_id [ad_conn package_id]
Index: openacs-4/packages/categories/www/cadmin/permission-manage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/permission-manage.tcl	1 Feb 2004 19:12:51 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/permission-manage.tcl	9 Feb 2004 19:48:44 -0000	1.3
@@ -23,11 +23,11 @@
 set page_title "Permission Management for $tree_name"
 
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
-lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] "Manage Permissions"
+lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] "Manage Permissions"
 
 set url_vars [export_vars {tree_id object_id locale}]
 set package_id [ad_conn package_id]
Index: openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl	1 Feb 2004 19:12:51 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl	9 Feb 2004 19:48:44 -0000	1.4
@@ -16,4 +16,4 @@
 
 db_dml toggle_site_wide_status ""
 
-ad_returnredirect [export_vars -base permission-manage {tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base permission-manage {tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl	5 Feb 2004 18:58:48 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl	9 Feb 2004 19:48:44 -0000	1.4
@@ -17,4 +17,4 @@
 
 category_tree::copy -source_tree $source_tree_id -dest_tree $target_tree_id
 
-ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/tree-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/tree-copy.tcl	8 Feb 2004 17:23:07 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/tree-copy.tcl	9 Feb 2004 19:46:31 -0000	1.6
@@ -25,11 +25,11 @@
 set target_tree_id $tree_id
 
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
-lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] "Copy a tree"
+lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] "Copy a tree"
 
 template::multirow create trees tree_id tree_name site_wide_p view_url copy_url
 
Index: openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl	1 Feb 2004 19:12:52 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl	9 Feb 2004 19:48:44 -0000	1.3
@@ -23,7 +23,7 @@
 category_tree::delete $tree_id
 
 if {![info exists object_id]} {
-    ad_returnredirect ".?[export_vars {locale}]"
+    ad_returnredirect ".?[export_vars -no_empty {locale}]"
 } else {
-    ad_returnredirect [export_vars -base one-object {locale object_id}]
+    ad_returnredirect [export_vars -no_empty -base one-object {locale object_id}]
 }
Index: openacs-4/packages/categories/www/cadmin/tree-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/tree-delete.tcl	8 Feb 2004 17:22:49 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/tree-delete.tcl	9 Feb 2004 19:48:44 -0000	1.6
@@ -29,11 +29,11 @@
 
 set page_title "Delete Category Tree \"$tree_name\""
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
-lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] Delete
+lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] Delete
 
 set instance_list [category_tree::usage $tree_id]
 
Index: openacs-4/packages/categories/www/cadmin/tree-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-form.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/tree-form.tcl	1 Feb 2004 19:12:52 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/tree-form.tcl	9 Feb 2004 19:48:44 -0000	1.5
@@ -21,8 +21,8 @@
 }
 
 if { [info exists object_id] } {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
 lappend context_bar $page_title
Index: openacs-4/packages/categories/www/cadmin/tree-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-map.tcl	6 Feb 2004 17:18:47 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-map.tcl	9 Feb 2004 19:48:44 -0000	1.4
@@ -24,7 +24,7 @@
     permission::require_permission -object_id $tree_id -privilege category_tree_read
 }
 
-set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}]" "Category Management"] "Mapping Parameters"]
+set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}]" "Category Management"] "Mapping Parameters"]
 
 if {$edit_p} {
     # parameters are edited, so get old data
@@ -54,7 +54,7 @@
 	category_tree::map -tree_id $tree_id -subtree_category_id $category_id -object_id $object_id -assign_single_p $assign_single_p -require_category_p $require_category_p
     }
 } -after_submit {
-    ad_returnredirect [export_vars -base one-object {locale object_id}]
+    ad_returnredirect [export_vars -no_empty -base one-object {locale object_id}]
     ad_script_abort
 }
 
Index: openacs-4/packages/categories/www/cadmin/tree-order-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-order-update.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/tree-order-update.tcl	1 Feb 2004 19:12:52 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/tree-order-update.tcl	9 Feb 2004 19:48:44 -0000	1.3
@@ -77,4 +77,4 @@
     return
 }
 
-ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl	1 Feb 2004 19:12:52 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl	9 Feb 2004 19:48:44 -0000	1.3
@@ -20,4 +20,4 @@
 
 category_tree::unmap -tree_id $tree_id -object_id $object_id
 
-ad_returnredirect [export_vars -base one-object {locale object_id}]
+ad_returnredirect [export_vars -no_empty -base one-object {locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/tree-unmap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-unmap.tcl	1 Feb 2004 19:12:52 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-unmap.tcl	9 Feb 2004 19:48:44 -0000	1.4
@@ -28,13 +28,13 @@
 
 set page_title "Unmap tree"
 
-set delete_url [export_vars -base tree-unmap-2 { tree_id locale object_id }]
-set cancel_url [export_vars -base one-object { locale object_id }]
+set delete_url [export_vars -no_empty -base tree-unmap-2 { tree_id locale object_id }]
+set cancel_url [export_vars -no_empty -base one-object { locale object_id }]
 
 set object_context [category::get_object_context $object_id]
 set object_name [lindex $object_context 1]
 set tree_name $tree(tree_name)
 
-set context_bar [list $object_context [list [export_vars -base one-object {locale object_id}] "Category Management"] "Unmap \"$tree_name\""]
+set context_bar [list $object_context [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"] "Unmap \"$tree_name\""]
 
 ad_return_template
Index: openacs-4/packages/categories/www/cadmin/tree-update-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/tree-update-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/tree-update-2.tcl	1 Feb 2004 19:12:52 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/tree-update-2.tcl	9 Feb 2004 19:48:44 -0000	1.6
@@ -38,4 +38,4 @@
     return
 }
 
-ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
Index: openacs-4/packages/categories/www/cadmin/tree-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/tree-update.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-update.tcl	1 Feb 2004 19:12:52 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-update.tcl	9 Feb 2004 19:48:44 -0000	1.4
@@ -90,7 +90,7 @@
 	ad_return_complaint 1 "Error during update: $done_list"
 	return
     }
-    ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+    ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
     return
 
 } elseif {![empty_string_p $submit_phase_in]} {
@@ -102,7 +102,7 @@
 	category_tree::flush_cache $tree_id
     }
 
-    ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+    ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
     return
    
 } elseif {![empty_string_p $submit_phase_out]} {
@@ -114,7 +114,7 @@
 	category_tree::flush_cache $tree_id
     }
 
-    ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+    ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
     return
 
 } elseif {![empty_string_p $submit_delete]} {
@@ -124,11 +124,11 @@
     set tree_name $tree(tree_name)
 
     if {[info exists object_id]} {
-	set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+	set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
     } else {
-	set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+	set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
     }
-    lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] "Delete categories"
+    lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] "Delete categories"
 
     set form_vars_cancel [export_form_vars tree_id locale object_id]
     set form_vars_delete [export_form_vars category_ids:multiple tree_id locale object_id]
@@ -149,7 +149,7 @@
 } else {
 
     ns_log Warning "Unhandled user input in packages/categories/www/tree-update.tcl"
-    ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}]
+    ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id}]
     return
 
 }
Index: openacs-4/packages/categories/www/cadmin/tree-usage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-usage.tcl	5 Feb 2004 18:58:48 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-usage.tcl	9 Feb 2004 19:48:44 -0000	1.4
@@ -30,11 +30,11 @@
 set page_title "Modules using Category Tree \"$tree_name\""
 
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base one-object {locale object_id}] "Category Management"]]
 } else {
-    set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]]
+    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "Category Management"]]
 }
-lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] Usage
+lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id}] $tree_name] Usage
 
 
 template::multirow create modules package object_id object_name package_id instance_name read_p