diff --git a/core/includes/session.inc b/core/includes/session.inc index 4420f1f..f96c5b4 100644 --- a/core/includes/session.inc +++ b/core/includes/session.inc @@ -93,7 +93,7 @@ function _drupal_session_read($sid) { // a HTTPS session or we are about to log in so we check the sessions table // for an anonymous session with the non-HTTPS-only cookie. if (Drupal::request()->isSecure()) { - $values = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.ssid = :ssid", array(':ssid' => $sid))->fetchObject(); + $values = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.ssid = :ssid", array(':ssid' => $sid))->fetchAssoc(); if (!$values) { if (isset($_COOKIE[$insecure_session_name])) { $values = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = :sid AND s.uid = 0", array( @@ -103,7 +103,7 @@ function _drupal_session_read($sid) { } } else { - $values = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = :sid", array(':sid' => $sid))->fetchObject(); + $values = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = :sid", array(':sid' => $sid))->fetchAssoc(); } if ($values) { @@ -112,7 +112,7 @@ function _drupal_session_read($sid) { // We found the client's session record and they are an authenticated, // active user. - if ($user && $user->id() > 0 && $user->status() == 1) { + if ($user && $user->id() > 0 && $user->status == 1) { // Add roles element to $user. $user->roles = array(); $user->roles[DRUPAL_AUTHENTICATED_RID] = DRUPAL_AUTHENTICATED_RID;