Index: openacs-4/packages/file-storage/www/folder-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-oracle.xql,v
diff -u -N
--- openacs-4/packages/file-storage/www/folder-chunk-oracle.xql	16 Jul 2018 16:43:49 -0000	1.17
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-  <fullquery name="select_folder_contents">
-    <querytext>
-
-            select fs_objects.object_id,
-                   fs_objects.name,
-                   fs_objects.live_revision,
-                   fs_objects.type,
-	           fs_objects.pretty_type,
-                   to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
-                   fs_objects.content_size,
-                   fs_objects.url,
-                   fs_objects.sort_key,
-                   -fs_objects.sort_key as sort_key_desc,
-                   fs_objects.file_upload_name,
-                   fs_objects.title,
-                   case
-                     when :folder_path is null
-                     then fs_objects.file_upload_name
-                     else :folder_path || fs_objects.file_upload_name
-                   end as file_url,
-                   case
-                     when fs_objects.last_modified >= (sysdate - :n_past_days)
-                     then 1
-                     else 0
-                   end as new_p
-            from fs_objects
-            where fs_objects.parent_id = :folder_id
-              and exists (select 1
-                   from acs_object_party_privilege_map m
-                   where m.object_id = fs_objects.object_id
-                     and m.party_id = :viewing_user_id
-                     and m.privilege = 'read')
-            $orderby
-
-    </querytext>
-  </fullquery>
-</queryset>
Index: openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql,v
diff -u -N
--- openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	16 Jul 2018 16:43:49 -0000	1.22
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-  <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-  <fullquery name="select_folder_contents">
-    <querytext>
-
-            select fs_objects.object_id,
-                   fs_objects.mime_type,
-                   fs_objects.name,
-                   fs_objects.live_revision,
-                   fs_objects.type,
-                   fs_objects.pretty_type,
-                   to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
-                   fs_objects.content_size,
-                   fs_objects.url,
-                   fs_objects.sort_key,
-                   -fs_objects.sort_key as sort_key_desc,
-                   fs_objects.file_upload_name,
-                   fs_objects.title,
-                   case
-                     when :folder_path is null
-                     then fs_objects.file_upload_name
-                     else :folder_path || fs_objects.file_upload_name
-                   end as file_url,
-                   fs_objects.last_modified >= (current_timestamp - cast('$n_past_days days' as interval)) as new_p
-            from fs_objects
-            where fs_objects.parent_id = :folder_id
-	    and   acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'read')
-
-            $categories_limitation
-            $orderby
-
-    </querytext>
-  </fullquery>
-</queryset>
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.61.2.2 -r1.61.2.3
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	15 Mar 2019 08:49:35 -0000	1.61.2.2
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	15 Mar 2019 09:40:30 -0000	1.61.2.3
@@ -304,7 +304,33 @@
     new_version_url
     views
     categories
-} contents select_folder_contents {} {
+} contents select_folder_contents [subst {
+            select fs_objects.object_id,
+                   fs_objects.mime_type,
+                   fs_objects.name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.pretty_type,
+                   to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
+                   fs_objects.content_size,
+                   fs_objects.url,
+                   fs_objects.sort_key,
+                   -fs_objects.sort_key as sort_key_desc,
+                   fs_objects.file_upload_name,
+                   fs_objects.title,
+                   case
+                     when :folder_path is null
+                     then fs_objects.file_upload_name
+                     else :folder_path || fs_objects.file_upload_name
+                   end as file_url,
+                   fs_objects.last_modified >= (current_timestamp - cast('$n_past_days days' as interval)) as new_p
+            from fs_objects
+            where fs_objects.parent_id = :folder_id
+	    and   acs_permission.permission_p(fs_objects.object_id, :viewing_user_id, 'read')
+
+            $categories_limitation
+            $orderby
+}] {
     set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi]
     set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"]