diff --git a/core/includes/session.inc b/core/includes/session.inc index 528d465..40e495f 100644 --- a/core/includes/session.inc +++ b/core/includes/session.inc @@ -112,7 +112,8 @@ 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 ($values && $values['uid'] > 0 && $values['status'] == 1) { + $user = new UserSession($values); // Add roles element to $user. $rids = db_query("SELECT ur.rid FROM {users_roles} ur WHERE ur.uid = :uid", array(':uid' => $user->uid))->fetchCol(); $user->roles = array_merge(array(DRUPAL_AUTHENTICATED_RID), $rids); diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php index df1c715..0f4a387 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php @@ -8,8 +8,10 @@ namespace Drupal\user\Plugin\views\access; use Drupal\Component\Annotation\Plugin; +use Drupal\Core\Session\AccountInterface; use Drupal\views\Plugin\views\access\AccessPluginBase; use Drupal\Core\Annotation\Translation; +use Symfony\Component\Routing\Route; /** * Access plugin that provides permission-based access control. @@ -29,7 +31,10 @@ class Permission extends AccessPluginBase { */ protected $usesOptions = TRUE; - public function access($account) { + /** + * {@inheritdoc} + */ + public function access(AccountInterface $account) { return user_access($this->options['perm'], $account) || user_access('access all views', $account); }