From 9c43e8fc7a192dfe768c76a539373915bddaa0aa Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 29 Jun 2001 22:08:57 +0000
Subject: Extremely large commit:

- Fixed tiny quote problem in account.php.

- Fixed tiny bug in comment.inc.

- Fixed tiny bug in comment.module.

- Fixed tiny bug in meta.module.

- Simplified user_access() API.

- Rewrote link system: still needs fine-tuning and testing so don't
  upgrade if you are running a production site. ;)

  Updated all modules and themes to reflect this change.  All other
  themes and modules need updating too!
---
 includes/user.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'includes/user.inc')

diff --git a/includes/user.inc b/includes/user.inc
index 5e0bf2274..9e1370f6b 100644
--- a/includes/user.inc
+++ b/includes/user.inc
@@ -52,12 +52,14 @@ function user_save($account, $array) {
   return user_load(($account->userid ? $account->userid : $array[userid]));
 }
 
-function user_access($account, $perm) {
-  if ($account->id == 1) {
+function user_access($perm) {
+  global $user;
+
+  if ($user->id == 1) {
     return 1;
   }
-  else if ($account->perm) {
-    return strstr($account->perm, $perm);
+  else if ($user->perm) {
+    return strstr($user->perm, $perm);
   }
   else {
     return db_fetch_object(db_query("SELECT * FROM role WHERE name = 'anonymous user' AND perm LIKE '%$perm%'"));
-- 
cgit v1.2.3