Index: openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql,v
diff -u -N -r1.3 -r1.3.4.1
--- openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql	2 Apr 2013 11:50:40 -0000	1.3
+++ openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql	2 Jul 2016 09:50:18 -0000	1.3.4.1
@@ -3,27 +3,6 @@
 <queryset>
   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-  <fullquery name="revisions_info">      
-    <querytext>
-    select  ci.name, n.revision_id as version_id,
-      person__name(n.creation_user) as author,
-      n.creation_user as author_id,
-      to_char(n.last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
-      n.description,
-      acs_permission__permission_p(n.revision_id,:user_id,'admin') as admin_p,
-      acs_permission__permission_p(n.revision_id,:user_id,'delete') as delete_p,
-      char_length(n.data) as content_size,
-      content_revision__get_number(n.revision_id) as version_number	
-    from cr_revisionsi n, cr_items ci
-    where ci.item_id = n.item_id and ci.item_id = :page_id
-          and exists (select 1 from acs_object_party_privilege_map m
-                      where m.object_id = n.revision_id
-                        and m.party_id = :user_id
-                        and m.privilege = 'read')
-	order by n.revision_id desc
-    </querytext>
-  </fullquery> 
-
   <fullquery name="revisions_info">
     <rdbms><type>postgresql</type><version>8.4</version></rdbms>
       <querytext>
Index: openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl,v
diff -u -N -r1.31.2.6 -r1.31.2.7
--- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	16 Jun 2016 08:11:20 -0000	1.31.2.6
+++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	2 Jul 2016 09:50:19 -0000	1.31.2.7
@@ -23,13 +23,11 @@
     my instvar package_key
     if {[info exists privilege]} {
       set sql [::xo::dc select -vars package_id \
-                   -from "apm_packages, acs_object_party_privilege_map ppm, site_nodes s" \
+                   -from "apm_packages, site_nodes s" \
                    -where {
                      package_key = :package_key 
-                     and s.object_id = package_id 
-                     and ppm.object_id = package_id 
-                     and ppm.party_id = :party_id
-                     and ppm.privilege = :privilege
+                     and s.object_id = package_id
+                     and acs_permission__permission_p(package_id, :party_id, :privilege)
                    } -limit 1]
       ::xo::dc get_value get_package_id $sql
     } else {
Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v
diff -u -N -r1.54.2.12 -r1.54.2.13
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	30 Mar 2016 10:31:29 -0000	1.54.2.12
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	2 Jul 2016 09:50:19 -0000	1.54.2.13
@@ -1163,10 +1163,7 @@
                         content_revision__get_number(r.revision_id) as version_number " \
                  -from  "cr_items ci, cr_revisions r, acs_objects o" \
                  -where "ci.item_id = :page_id and r.item_id = ci.item_id and o.object_id = r.revision_id 
-             and exists (select 1 from acs_object_party_privilege_map m
-                         where m.object_id = r.revision_id
-                          and m.party_id = :user_id
-                          and m.privilege = 'read')" \
+                         and acs_permission__permission_p(r.revision_id, :user_id, 'read')" \
                  -orderby "r.revision_id desc"]
     
     ::xo::dc foreach revisions_select $sql {