Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v
diff -u -r1.33 -r1.33.4.1
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	8 Aug 2006 21:26:48 -0000	1.33
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	16 May 2008 12:05:03 -0000	1.33.4.1
@@ -130,7 +130,7 @@
             select case when file_storage.get_content_type(i.item_id) = 'content_folder'
                         then :folder_url || '?folder_id='
                         else :file_url || '?file_id='
-                   end || i.item_id,
+                   end || i.item_id || :extra_vars,  
                    file_storage.get_title(i.item_id)
             from cr_items i
             where item_id not in (select i2.item_id
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -r1.44 -r1.44.4.1
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	8 Aug 2006 21:26:48 -0000	1.44
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	16 May 2008 12:05:03 -0000	1.44.4.1
@@ -120,7 +120,7 @@
             select (case when file_storage__get_content_type(i.item_id) = 'content_folder'
                          then :folder_url || '?folder_id='
                          else :file_url || '?file_id='
-                    end) || i.item_id,
+                    end) || i.item_id || :extra_vars,
                    file_storage__get_title(i.item_id)
             from (select tree_ancestor_keys(cr_items_get_tree_sortkey(:start_id)) as tree_sortkey) parents,
                  (select tree_sortkey from cr_items where item_id = :root_folder_id) root,
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -r1.64 -r1.64.2.1
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	6 Mar 2008 00:12:23 -0000	1.64
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	16 May 2008 12:05:03 -0000	1.64.2.1
@@ -176,6 +176,9 @@
 	set start_id $item_id
     }
 
+    if { [exists_and_not_null extra_vars] } {
+	set extra_vars [concat &$extra_vars]
+    }
     set context_bar [db_list_of_lists context_bar {}]
     if {!($item_id == $root_folder_id)} {
         lappend context_bar $final