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.18 -r1.117.2.19
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	13 Jul 2023 13:09:51 -0000	1.117.2.18
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	30 Oct 2023 16:58:17 -0000	1.117.2.19
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.10.1b1" url="http://openacs.org/repository/download/apm/acs-content-repository-5.10.1b1.apm">
+    <version name="5.10.1b2" url="http://openacs.org/repository/download/apm/acs-content-repository-5.10.1b2.apm">
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
         <owner url="http://openacs.org">OpenACS</owner>
@@ -24,7 +24,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-content-repository" version="5.10.1b1"/>
+        <provides url="acs-content-repository" version="5.10.1b2"/>
         <requires url="acs-kernel" version="5.10.1b1"/>
         <requires url="acs-service-contract" version="5.10.1b1"/>
         <requires url="acs-tcl" version="5.10.1b1"/>
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v
diff -u -r1.77.2.1 -r1.77.2.2
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	27 Aug 2019 09:21:42 -0000	1.77.2.1
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	30 Oct 2023 16:58:17 -0000	1.77.2.2
@@ -1320,24 +1320,20 @@
 $$ LANGUAGE plpgsql;
 
 
--- I hard code the content_item_globals.c_root_folder_id here
-select define_function_args('content_item__get_virtual_path','item_id,root_folder_id;-100');
+select define_function_args('content_item__get_virtual_path','item_id,root_folder_id;null');
 --
 -- procedure content_item__get_virtual_path/2
 --
 CREATE OR REPLACE FUNCTION content_item__get_virtual_path(
    get_virtual_path__item_id integer,
-   get_virtual_path__root_folder_id integer -- default content_item_globals.c_root_folder_id -- default '-100'
-
+   get_virtual_path__root_folder_id integer
 ) RETURNS varchar AS $$
 DECLARE
   v_path                                  varchar;
   v_item_id                               cr_items.item_id%TYPE;
   v_is_folder                             boolean;
   v_index                                 cr_items.item_id%TYPE;
 BEGIN
-  -- XXX possible bug: root_folder_id arg is ignored.
-
   -- first resolve the item
   v_item_id := content_symlink__resolve(get_virtual_path__item_id);
 
@@ -1346,9 +1342,9 @@
 
   -- if the folder has an index page
   if v_is_folder = 't' and v_index is not null then
-    v_path := content_item__get_path(content_symlink__resolve(v_index),null);
+    v_path := content_item__get_path(content_symlink__resolve(v_index), get_virtual_path__root_folder_id);
   else
-    v_path := content_item__get_path(v_item_id,null);
+    v_path := content_item__get_path(v_item_id, get_virtual_path__root_folder_id);
   end if;
 
   return v_path;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.10.1b1-5.10.1b2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?