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.39.2.1 -r1.39.2.2
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	15 Mar 2019 09:58:23 -0000	1.39.2.1
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	20 Nov 2019 13:18:27 -0000	1.39.2.2
@@ -45,27 +45,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="children_have_permission_p.child_perms">
-        <querytext>
-            select count(*)
-            from cr_items
-            where item_id in (select item_id
-                              from cr_items
-                              connect by prior item_id = parent_id
-                              start with item_id = :item_id)
-            and acs_permission.permission_p(item_id, :user_id, :privilege) = 'f'
-        </querytext>
-    </fullquery>
-
-    <fullquery name="children_have_permission_p.child_items">
-        <querytext>
-            select item_id as child_item_id
-            from cr_items
-            connect by prior item_id = parent_id
-            start with item_id = :item_id
-        </querytext>
-    </fullquery>
-
     <fullquery name="fs_context_bar_list.title">
         <querytext>
             begin
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.51.2.1 -r1.51.2.2
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	15 Mar 2019 09:58:23 -0000	1.51.2.1
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	20 Nov 2019 13:18:27 -0000	1.51.2.2
@@ -37,26 +37,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="children_have_permission_p.child_perms">
-        <querytext>
-            select count(*)
-            from cr_items c1, cr_items c2
-            where c2.item_id = :item_id
-            and c1.tree_sortkey between c2.tree_sortkey and tree_right(c2.tree_sortkey)
-            and not acs_permission__permission_p(c1.item_id, :user_id, :privilege)
-        </querytext>
-    </fullquery>
-
-    <fullquery name="children_have_permission_p.child_items">
-        <querytext>
-            select c1.item_id as child_item_id
-            from cr_items c1, cr_items c2
-            where c2.item_id = :item_id
-            and c1.tree_sortkey between c2.tree_sortkey and tree_right(c2.tree_sortkey)
-            order by c1.tree_sortkey
-        </querytext>
-    </fullquery>
-
     <fullquery name="fs_context_bar_list.title">
         <querytext>
             select file_storage__get_title(:item_id)
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.90.2.7 -r1.90.2.8
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	16 Nov 2019 14:40:40 -0000	1.90.2.7
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	20 Nov 2019 13:18:27 -0000	1.90.2.8
@@ -84,35 +84,35 @@
 } {
     This procedure, given a content item and a privilege, checks to see if
     there are any children of the item on which the user does not have that
-    privilege.  It returns 0 if there is any child item on which the user
-    does not have the privilege.  It returns 1 if the user has the
-    privilege on every child item.
+    privilege.
+
+    @return 0 if there is any child item on which the user does not
+    have the privilege.  It returns 1 if the user has the privilege on
+    every child item.
 } {
     if {$user_id eq ""} {
         set user_id [ad_conn user_id]
     }
 
-    # This only gets child folders and items
-
-    set num_wo_perm [db_string child_perms {}]
-
-    # now check revisions
-
-    db_foreach child_items {} {
-        incr num_wo_perm [db_string revision_perms {
-            select count(*)
-            from cr_revisions
-            where item_id = :child_item_id
-            and not acs_permission.permission_p(revision_id, :user_id, :privilege)
-        }]
-    }
-
-    if { $num_wo_perm > 0 } {
-        return 0
-    } else {
-        return 1
-    }
-
+    # Check that no item or revision over the whole cr_item
+    # descendants hierarchy does not have the required permissison.
+    set all_children_have_privilege_p [db_string all_children_have_privilege {
+        with recursive children(item_id) as (
+            select cast(:item_id as integer) as item_id
+            union all
+            select i.item_id
+            from cr_items i,
+                 children c
+            where i.parent_id = c.item_id
+        )
+        select not exists (select 1 from children
+                            where not acs_permission.permission_p(item_id, :user_id, :privilege))
+           and not exists (select 1 from cr_revisions
+                            where item_id in (select item_id from children)
+                              and not acs_permission.permission_p(revision_id, :user_id, :privilege))
+          from dual
+    }]
+    return [expr {$all_children_have_privilege_p ? 1 : 0}]
 }