--- user.module-old	Thu May 27 17:22:28 2004
+++ user.module	Thu May 27 17:42:20 2004
@@ -291,7 +291,7 @@
 /*** Module hooks **********************************************************/
 
 function user_perm() {
-  return array("administer users", "access user list");
+  return array("administer users", "access users");
 }
 
 function user_search($keys) {
@@ -405,7 +405,7 @@
             $output = t("There are currently %members and %visitors online.", array("%members" => format_plural($total_users, "1 user", "%count users"), "%visitors" => format_plural($guests->count, "1 guest", "%count guests")));
           }
 
-          if (user_access("access user list") && $total_users) {
+          if (user_access("access users") && $total_users) {
 
             // Display a list of currently online users
             $max_users = variable_get("user_block_max_list_count", 10);
@@ -1008,15 +1008,20 @@
     print theme('page', $output, $user->name);
   }
   else if ($uid && $account = user_load(array('uid' => $uid, "status" => 1))) {
-    $output = form_item(t("Name"), $account->name);
+    if (user_access("access users")) {
+      $output = form_item(t("Name"), $account->name);
 
-    $output .= implode("\n", module_invoke_all('user', "view_public", "", $account));
+      $output .= implode("\n", module_invoke_all('user', "view_public", "", $account));
 
-    if (user_access("administer users")) {
-      $output .= form_item(t("Administration"), l(t("edit account"), "admin/user/edit/$account->uid"));
-    }
+      if (user_access("administer users")) {
+        $output .= form_item(t("Administration"), l(t("edit account"), "admin/user/edit/$account->uid"));
+      }
 
-    print theme('page', $output, $account->name);
+      print theme('page', $output, $account->name);
+    }
+    else {
+      print theme('page', message_access(), t("Access Denied"));
+    }
   }
   else {
     $output = user_login();