Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -N -r1.21.2.22 -r1.21.2.23
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	18 Jul 2005 18:53:36 -0000	1.21.2.22
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	25 Jul 2005 18:42:14 -0000	1.21.2.23
@@ -50,8 +50,12 @@
 
 set content_size_total 0
 
+#AG: We're an include file, and we may be included from outside file-storage.
+#So we need to query for the package_id rather than getting it from ad_conn.
+set package_and_root [fs::get_folder_package_and_root $folder_id]
+set package_id [lindex $package_and_root 0]
 if {![exists_and_not_null root_folder_id]} {
-    set root_folder_id [fs::get_root_folder]
+    set root_folder_id [lindex $package_and_root 1]
 }
 
 if {![string equal $root_folder_id $folder_id]} {
@@ -67,9 +71,9 @@
 
 lappend actions "\#file-storage.Add_File\#" ${fs_url}file-add?[export_vars folder_id] "Upload a file in this folder" "\#file-storage.Create_a_URL\#" ${fs_url}simple-add?[export_vars folder_id] "Add a link to a web page" "\#file-storage.New_Folder\#" ${fs_url}folder-create?[export_vars {{parent_id $folder_id}}] "\#file-storage.Create_a_new_folder\#"
 
-set expose_rss_p [parameter::get -parameter ExposeRssP -default 0]
+set expose_rss_p [parameter::get -parameter ExposeRssP -package_id $package_id -default 0]
 
-set target_window_name [parameter::get -parameter DownloadTargetWindowName -default ""]
+set target_window_name [parameter::get -parameter DownloadTargetWindowName -package_id $package_id -default ""]
 if { [string equal $target_window_name ""] } {
     set target_attr ""
 } else {
@@ -92,10 +96,10 @@
 
 set elements [list icon \
 		  [list label "" \
-		       display_template {<a @target_attr@ class="file-type-icon" href="@contents.download_url@"><img src="@contents.icon@"  border=0 alt="#file-storage.@contents.pretty_type@#" /></a>}] \
+		       display_template {<a <if @contents.type@ ne "folder">@target_attr;noquote@</if> class="file-type-icon" href="@contents.download_url@"><img src="@contents.icon@"  border=0 alt="#file-storage.@contents.pretty_type@#" /></a>}] \
 		  name \
 		  [list label [_ file-storage.Name] \
-                       display_template {<a @target_attr@ href="@contents.file_url@"><if @contents.title@ nil>@contents.name@</a></if><else>@contents.title@</a><br/><if @contents.name@ ne @contents.title@><span style="color: \#999;">@contents.name@</span></if></else>} \
+               display_template {<a <if @contents.type@ ne "folder">@target_attr;noquote@</if> href="@contents.file_url@"><if @contents.title@ nil>@contents.name@</a></if><else>@contents.title@</a><br/><if @contents.name@ ne @contents.title@><span style="color: \#999;">@contents.name@</span></if></else>} \
 		       orderby_desc {fs_objects.name desc} \
 		       orderby_asc {fs_objects.name asc}] \
 		  content_size_pretty \