diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-02-01 14:08:26 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-02-01 14:08:26 +0000 |
| commit | ece2aab4fdf7800589b36a40237fa20e9d04c616 (patch) | |
| tree | 149ac4736f7e9368b98d8cb7ab3e49e9b4de1963 | |
| parent | baa2ecc81cb09791286b0f906b0dd643c4de4b2d (diff) | |
| download | brdo-ece2aab4fdf7800589b36a40237fa20e9d04c616.tar.gz brdo-ece2aab4fdf7800589b36a40237fa20e9d04c616.tar.bz2 | |
- Patch #47344 by gordon: fixed problem with anonymous user role not being properly initialized.
| -rw-r--r-- | modules/user.module | 7 | ||||
| -rw-r--r-- | modules/user/user.module | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module index 81723ce9a..5b1de2884 100644 --- a/modules/user.module +++ b/modules/user.module @@ -67,7 +67,12 @@ function user_load($array = array()) { $user = db_fetch_object($result); $user = drupal_unpack($user); - $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; + if ($user->uid) { + $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; + } + else { + $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user'; + } $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d', $user->uid); while ($role = db_fetch_object($result)) { $user->roles[$role->rid] = $role->name; diff --git a/modules/user/user.module b/modules/user/user.module index 81723ce9a..5b1de2884 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -67,7 +67,12 @@ function user_load($array = array()) { $user = db_fetch_object($result); $user = drupal_unpack($user); - $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; + if ($user->uid) { + $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; + } + else { + $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user'; + } $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d', $user->uid); while ($role = db_fetch_object($result)) { $user->roles[$role->rid] = $role->name; |