diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-26 07:30:29 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-26 07:30:29 +0000 |
| commit | 665c9fdc2ca50f7960c16b375685485b3eb8b1cc (patch) | |
| tree | 273088dccb033efaf0e7ed718e6041842e32c7ae /includes/session.inc | |
| parent | 116de1793300f2aee3d71297c26ec448f8141196 (diff) | |
| download | brdo-665c9fdc2ca50f7960c16b375685485b3eb8b1cc.tar.gz brdo-665c9fdc2ca50f7960c16b375685485b3eb8b1cc.tar.bz2 | |
Roll-back of users -> user table name change in #330983: Broken pgsql is no fun.
Diffstat (limited to 'includes/session.inc')
| -rw-r--r-- | includes/session.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/session.inc b/includes/session.inc index 141af2f8f..aa06db4ca 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -83,7 +83,7 @@ function _sess_read($key) { // Otherwise, if the session is still active, we have a record of the // client's session in the database. - $user = db_query("SELECT u.*, s.* FROM {user} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = :sid", array(':sid' => $key))->fetchObject(); + $user = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = :sid", array(':sid' => $key))->fetchObject(); // We found the client's session record and they are an authenticated user. if ($user && $user->uid > 0) { @@ -93,7 +93,7 @@ function _sess_read($key) { // Add roles element to $user. $user->roles = array(); $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; - $user->roles += db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {user_role} ur ON ur.rid = r.rid WHERE ur.uid = :uid", array(':uid' => $user->uid))->fetchAllKeyed(0, 1); + $user->roles += db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = :uid", array(':uid' => $user->uid))->fetchAllKeyed(0, 1); } // We didn't find the client's record (session has expired), or they // are an anonymous user. @@ -146,7 +146,7 @@ function _sess_write($key, $value) { // Last access time is updated no more frequently than once every 180 seconds. // This reduces contention in the users table. if ($user->uid && REQUEST_TIME - $user->access > variable_get('session_write_interval', 180)) { - db_update('user') + db_update('users') ->fields(array( 'access' => REQUEST_TIME )) |