Index: openacs-4/packages/attachments/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/attachments/www/attach.tcl	2 Aug 2004 16:55:37 -0000	1.7.2.2
+++ openacs-4/packages/attachments/www/attach.tcl	11 Aug 2004 02:27:06 -0000	1.7.2.3
@@ -24,9 +24,8 @@
 }
 
 # Load up file storage information
-set root_folder_id [attachments::get_root_folder]
 if {[empty_string_p $folder_id]} {
-    set folder_id $root_folder_id
+    set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id]
 } 
 
 # sanity check
@@ -54,11 +53,7 @@
 
 set passthrough_vars "object_id=$object_id&return_url=[ns_urlencode $return_url]&pretty_object_name=[ns_urlencode $pretty_object_name]"
 
-if {$folder_id == $root_folder_id} {
-    set fs_context_bar_html "[_ attachments.Top]"
-} else {
-    set fs_context_bar_html [attachments::context_bar -extra_vars $passthrough_vars -folder_id $folder_id]
-}
+set fs_context_bar_html [attachments::context_bar -extra_vars $passthrough_vars -folder_id $folder_id]
 
 set context "[_ attachments.Attach]"
 
Index: openacs-4/packages/attachments/www/file-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add-2.tcl,v
diff -u -r1.4.4.1 -r1.4.4.2
--- openacs-4/packages/attachments/www/file-add-2.tcl	2 Aug 2004 16:55:37 -0000	1.4.4.1
+++ openacs-4/packages/attachments/www/file-add-2.tcl	11 Aug 2004 02:27:06 -0000	1.4.4.2
@@ -45,8 +45,7 @@
 # Get the ip
 set creation_ip [ad_conn peeraddr]
 
-set root_folder [attachments::get_root_folder]
-set fs_package_id [db_string get_fs_package_id "select package_id from fs_root_folders where folder_id=:root_folder"]
+set fs_package_id [site_node::get_element -url "[dotlrn::get_url]/file-storage/" -element "package_id"]
 
 #db_transaction {
     set file_id [db_nextval "acs_object_id_seq"]