Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.117.2.3 -r1.117.2.4
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	4 Mar 2020 18:23:41 -0000	1.117.2.3
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	13 Mar 2020 17:54:57 -0000	1.117.2.4
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.10.0d9" url="http://openacs.org/repository/download/apm/acs-content-repository-5.10.0d9.apm">
+    <version name="5.10.0d10" url="http://openacs.org/repository/download/apm/acs-content-repository-5.10.0d10.apm">
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
         <owner url="http://openacs.org">OpenACS</owner>
@@ -21,7 +21,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-content-repository" version="5.10.0d9"/>
+        <provides url="acs-content-repository" version="5.10.0d10"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-service-contract" version="5.9.1"/>
         <requires url="acs-tcl" version="5.10.0d9"/>
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v
diff -u -r1.53.2.1 -r1.53.2.2
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	10 Aug 2019 18:09:52 -0000	1.53.2.1
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	13 Mar 2020 17:54:57 -0000	1.53.2.2
@@ -771,7 +771,6 @@
 END;
 $$ LANGUAGE plpgsql stable;
 
-
 -- function is_sub_folder
 select define_function_args('content_folder__is_sub_folder','folder_id,target_folder_id');
 
@@ -784,48 +783,24 @@
    is_sub_folder__target_folder_id integer
 ) RETURNS boolean AS $$
 DECLARE
-  v_parent_id                           integer default 0;       
-  v_sub_folder_p                        boolean default 'f';           
-  v_rec                                 record;
+  v_result                              integer;
 BEGIN
+  With RECURSIVE parents AS (
+    select item_id, parent_id from cr_items where item_id = is_sub_folder__target_folder_id
+    UNION ALL
+    select cr_items.item_id, cr_items.parent_id from cr_items, parents
+    where cr_items.item_id = parents.parent_id
+  )
+  select count(*) into v_result from parents where parent_id = is_sub_folder__folder_id limit 1;
 
-  if is_sub_folder__folder_id = content_item__get_root_folder(null) or
-    is_sub_folder__folder_id = content_template__get_root_folder() then
-
-    v_sub_folder_p := 't';
+  if v_result = 0 then
+    return 'f';
+  else
+    return 't';
   end if;
-
---               select
---                 parent_id
---               from 
---                 cr_items
---               connect by
---                 prior parent_id = item_id
---               start with
---                 item_id = is_sub_folder__target_folder_id
-
-  for v_rec in select i2.parent_id
-               from cr_items i1, cr_items i2
-               where i1.item_id = is_sub_folder__target_folder_id
-                 and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
-               order by i2.tree_sortkey desc
-  LOOP
-    v_parent_id := v_rec.parent_id;
-    exit when v_parent_id = is_sub_folder__folder_id;
-    -- we did not find the folder, reset v_parent_id
-    v_parent_id := -4;
-  end LOOP;
-
-  if v_parent_id != -4 then 
-    v_sub_folder_p := 't';
-  end if;
-
-  return v_sub_folder_p;
- 
 END;
-$$ LANGUAGE plpgsql; 
+$$ LANGUAGE plpgsql;
 
-
 -- function is_empty
 select define_function_args('content_folder__is_empty','folder_id');
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.10.0d9-5.10.0d10.sql'.
Fisheye: No comparison available.  Pass `N' to diff?