Index: openacs-4/packages/dotlrn/www/admin/user-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-oracle.xql,v
diff -u -r1.10.2.1 -r1.10.2.1.4.1
--- openacs-4/packages/dotlrn/www/admin/user-oracle.xql	21 Feb 2004 02:36:51 -0000	1.10.2.1
+++ openacs-4/packages/dotlrn/www/admin/user-oracle.xql	17 Jun 2004 16:33:21 -0000	1.10.2.1.4.1
@@ -5,8 +5,7 @@
 
     <fullquery name="select_dotlrn_user_info">
         <querytext>
-            select dotlrn_users.*, guest_p,
-                   acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p
+            select dotlrn_users.*, guest_p
             from dotlrn_users, dotlrn_guest_status
             where dotlrn_users.user_id = :user_id
               and dotlrn_guest_status.user_id(+) = dotlrn_users.user_id
Index: openacs-4/packages/dotlrn/www/admin/user-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-postgresql.xql,v
diff -u -r1.3.2.2 -r1.3.2.2.4.1
--- openacs-4/packages/dotlrn/www/admin/user-postgresql.xql	21 Feb 2004 03:17:54 -0000	1.3.2.2
+++ openacs-4/packages/dotlrn/www/admin/user-postgresql.xql	17 Jun 2004 16:33:21 -0000	1.3.2.2.4.1
@@ -5,8 +5,7 @@
 
     <fullquery name="select_dotlrn_user_info">
         <querytext>
-            select dotlrn_users.*, guest_p,
-                   acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p
+            select dotlrn_users.*, guest_p
             from dotlrn_users left outer join dotlrn_guest_status
               on dotlrn_guest_status.user_id = dotlrn_users.user_id
             where dotlrn_users.user_id = :user_id
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.16 -r1.16.6.1
--- openacs-4/packages/dotlrn/www/admin/user.tcl	29 May 2003 18:05:01 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	17 Jun 2004 16:33:21 -0000	1.16.6.1
@@ -82,6 +82,12 @@
     set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
 }
 
+set site_wide_admin_p [permission::permission_p \
+        -party_id $user_id \
+        -object_id [acs_magic_object "security_context_root"] \
+        -privilege admin \
+        ]
+
 set context_bar [list [list users [_ dotlrn.Users]] "$first_names $last_name"]
 
 set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]