Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -N -r1.10.6.2 -r1.10.6.3
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	22 Jul 2004 10:11:16 -0000	1.10.6.2
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	8 Aug 2004 00:41:30 -0000	1.10.6.3
@@ -35,5 +35,5 @@
       </tr>
 </if>
 </table>
-<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
+<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@root_folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
 <p>@notification_chunk;noquote@</p>
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -N -r1.5.2.1.4.1 -r1.5.2.1.4.2
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	22 Jul 2004 10:11:16 -0000	1.5.2.1.4.1
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	8 Aug 2004 00:41:31 -0000	1.5.2.1.4.2
@@ -47,6 +47,18 @@
     ad_return -error
 }
 
+# Get the root folder for the file storage instance we belong to, which is defined as the
+# one mounted beneath the current package (dotlrn or acs-subsite).  Root folder should really
+# be a parameter to the portlet, something I'll consider for 5.2/2.2.
+
+set file_storage_node_id [site_node::get_node_id_from_object_id \
+                             -object_id [ad_conn package_id]]
+set file_storage_package_id [site_node::get_children \
+                                -package_key file-storage \
+                                -node_id $file_storage_node_id \
+                                -element package_id]
+set root_folder_id [fs::get_root_folder -package_id $file_storage_package_id]
+
 set folder_id [lindex $list_of_folder_ids 0]
 set scope_fs_url "/packages/file-storage/www/folder-chunk"
 set n_past_days ""