Index: openacs-4/packages/categories/www/categories-browse-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/categories/www/categories-browse-postgresql.xql 19 May 2003 13:10:32 -0000 1.3 +++ openacs-4/packages/categories/www/categories-browse-postgresql.xql 7 Aug 2017 23:48:05 -0000 1.4 @@ -13,16 +13,36 @@ and o.object_id = n.object_id and p.package_id = n.package_id and t.package_key = p.package_key - and exists (select 1 - from acs_object_party_privilege_map oppm - where oppm.object_id = n.object_id - and oppm.party_id = :user_id - and oppm.privilege = 'read') + and acs_permission__permission_p(n.object_id, :user_id, 'read') $letter_sql $package_sql $order_by_clause limit $last_row offset $first_row + + + select t.tree_id + from category_trees t, category_temp tmp + where ( + t.site_wide_p = 't' + or acs_permission__permission_p(t.tree_id, :user_id, 'category_tree_read') + ) + and t.tree_id = tmp.category_id + + + + + + select n.object_id + from acs_named_objects n, ($subtree_sql) s + where n.object_id = s.object_id + and acs_permission__permission_p(n.object_id, :user_id, 'read') + $letter_sql + $package_sql + + + +