Index: openacs-4/packages/file-storage/lib/folder-links-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links-oracle.xql,v
diff -u -N
--- openacs-4/packages/file-storage/lib/folder-links-oracle.xql 21 Nov 2017 11:20:13 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
- 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')
-
-
-
-
-
- declare begin
- :1 := content_item.get_path(:folder_id, :root_folder_id);
- end;
-
-
-
-
Index: openacs-4/packages/file-storage/lib/folder-links-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links-postgresql.xql,v
diff -u -N
--- openacs-4/packages/file-storage/lib/folder-links-postgresql.xql 21 Nov 2017 11:20:13 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-
-
-
- postgresql7.3
-
-
-
- and acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'read')
-
-
-
-
-
- select content_item__get_path(:folder_id, :root_folder_id)
-
-
-
-
Index: openacs-4/packages/file-storage/lib/folder-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links.tcl,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/file-storage/lib/folder-links.tcl 15 Mar 2019 09:08:44 -0000 1.5.2.1
+++ openacs-4/packages/file-storage/lib/folder-links.tcl 15 Mar 2019 09:14:06 -0000 1.5.2.2
@@ -29,7 +29,7 @@
set viewing_user_id [ad_conn user_id]
if {!$permission_check} {
set permission_p 1
- set permission_clause [db_map permission_clause]
+ set permission_clause {and acs_permission.permission_p(fs_objects.object_id, :viewing_user_id, 'read')}
} else {
set permission_p [permission::permission_p -party_id $viewing_user_id -object_id $folder_id -privilege "read"]
set permission_clause ""
@@ -41,7 +41,7 @@
set fs_url [site_node::get_url_from_object_id -object_id $package_id]
if {$root_folder_id ne $folder_id && "/view/" eq $base_url} {
- set folder_path [db_exec_plsql get_folder_path {}]
+ set folder_path [content::item::get_path -item_id $folder_id -root_folder_id $root_folder_id]
} else {
set folder_path ""
}