Index: openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql	7 Aug 2017 23:47:59 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql	20 Jun 2018 09:56:19 -0000	1.8
@@ -3,13 +3,6 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="name">      
-      <querytext>
-      select acs_object.name(:object_id) from dual
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="inherited_permissions">      
       <querytext>
       
@@ -29,30 +22,6 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="acl">      
-      <querytext>
-      
-  select grantee_id, acs_object.name(grantee_id) as grantee_name,
-         privilege
-  from acs_permissions
-  where object_id = :object_id
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="context">      
-      <querytext>
-      
-SELECT acs_object.name(context_id) as context_name, context_id, security_inherit_p
-  FROM acs_objects
- WHERE object_id = :object_id
-
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="children">      
       <querytext>
       
Index: openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql	7 Aug 2017 23:47:59 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql	20 Jun 2018 09:56:19 -0000	1.9
@@ -3,13 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="name">      
-      <querytext>
-      select acs_object__name(:object_id) 
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="inherited_permissions">      
       <querytext>
 
@@ -27,29 +20,6 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="acl">      
-      <querytext>
-      
-  select grantee_id, acs_object__name(grantee_id) as grantee_name,
-         privilege
-  from acs_permissions
-  where object_id = :object_id
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="context">      
-      <querytext>
-
-SELECT acs_object__name(context_id) as context_name, context_id, security_inherit_p
-  FROM acs_objects
- WHERE object_id = :object_id
-
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="children">      
   <querytext>
     
@@ -66,7 +36,6 @@
   </querytext>
 </fullquery>
 
-
 <fullquery name="children_count">      
   <querytext>
 
Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-subsite/www/permissions/one.tcl	9 May 2018 15:33:28 -0000	1.20
+++ openacs-4/packages/acs-subsite/www/permissions/one.tcl	20 Jun 2018 09:56:19 -0000	1.21
@@ -26,20 +26,28 @@
 }
 
 
-set name [db_string name {}]
+acs_object::get -object_id $object_id -array obj
+set name               $obj(object_name)
+set context_id         $obj(context_id)
+set security_inherit_p $obj(security_inherit_p)
 
 set context [list [list "./" [_ acs-subsite.Permissions]] [_ acs-subsite.Permissions_for_name]]
 
 db_multirow inherited inherited_permissions {} {}
 
-db_multirow acl acl {} {}
+db_multirow -extend {grantee_name} acl acl {
+    select grantee_id, privilege
+    from acs_permissions
+    where object_id = :object_id
+} {
+    set grantee_name [party::name -party_id $grantee_id]
+}
 
 set controls [list]
 set controlsUrl [export_vars -base grant {application_url object_id}]
 lappend controls "<a href=\"[ns_quotehtml $controlsUrl]\">[ns_quotehtml [_ acs-subsite.Grant_Permission]]</a>"
 
-db_1row context {}
-set context_name [lang::util::localize $context_name]
+set context_name [lang::util::localize [acs_object_name $context_id]]
 
 set toggleUrl [export_vars -base toggle-inherit {application_url object_id}]
 if { $security_inherit_p == "t" && $context_id ne "" } {
Index: openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql	24 Feb 2005 13:33:01 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql	20 Jun 2018 10:01:49 -0000	1.5
@@ -3,18 +3,6 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="object_info">      
-      <querytext>
-    select acs_object.name(object_id) as object_name,
-           acs_object.name(context_id) as parent_object_name,
-           context_id
-    from   acs_objects
-    where  object_id = :object_id
-
-      </querytext>
-</fullquery>
-
-
 <fullquery name="permissions">      
       <querytext>
     select ptab.grantee_id,
Index: openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql	7 Aug 2017 23:47:59 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql	20 Jun 2018 10:01:49 -0000	1.6
@@ -3,18 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="object_info">      
-      <querytext>
-    select acs_object__name(object_id) as object_name,
-           acs_object__name(context_id) as parent_object_name,
-           context_id
-    from   acs_objects
-    where  object_id = :object_id
-
-      </querytext>
-</fullquery>
-
-
 <fullquery name="permissions">      
       <querytext>
     select ptab.grantee_id,
Index: openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	17 Jun 2018 22:03:14 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	20 Jun 2018 10:01:49 -0000	1.19
@@ -19,7 +19,10 @@
     set return_url [ad_return_url]
 }
 
-db_1row object_info {}
+acs_object::get -object_id $object_id -array obj
+set object_name $obj(object_name)
+set context_id  $obj(context_id)
+set parent_object_name [acs_object_name $obj(context_id)]
 
 set elements [list]
 lappend elements grantee_name {