diff --git a/core/includes/form.inc b/core/includes/form.inc index 8aee8f0..b2a8bd5 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -4107,7 +4107,7 @@ function form_process_autocomplete($element, &$form_state) { $parameters = isset($element['#autocomplete_route_parameters']) ? $element['#autocomplete_route_parameters'] : array(); $path = Drupal::urlGenerator()->generate($element['#autocomplete_route_name'], $parameters); - $access = Drupal::service('access_manager')->checkNamedRoute($element['#autocomplete_route_name'], $parameters); + $access = Drupal::service('access_manager')->checkNamedRoute($element['#autocomplete_route_name'], $parameters, \Drupal::currentUser()); } elseif (!empty($element['#autocomplete_path'])) { $path = url($element['#autocomplete_path'], array('absolute' => TRUE)); diff --git a/core/includes/menu.inc b/core/includes/menu.inc index a31e892..f914327 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -995,7 +995,7 @@ function menu_item_route_access(Route $route, $href, &$map) { } } - return Drupal::service('access_manager')->check($route, $request); + return Drupal::service('access_manager')->check($route, $request, Drupal::currentUser()); } /** diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php index 234dd3f..5e59690 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php @@ -45,10 +45,10 @@ public function appliesTo() { /** * {@inheritdoc} */ - public function access(Route $route, Request $request) { + public function access(Route $route, Request $request, AccountInterface $account) { // @todo Replace user_access() with a correctly injected and session-using // alternative. - return user_access('access news feeds') && (bool) $this->database->queryRange('SELECT 1 FROM {aggregator_category}', 0, 1)->fetchField() ? static::ALLOW : static::DENY; + return $account->hasPermission('access news feeds') && (bool) $this->database->queryRange('SELECT 1 FROM {aggregator_category}', 0, 1)->fetchField() ? static::ALLOW : static::DENY; } } diff --git a/core/modules/layout/lib/Drupal/layout/Access/LayoutAccessCheck.php b/core/modules/layout/lib/Drupal/layout/Access/LayoutAccessCheck.php index 2c76dba..2149d6e 100644 --- a/core/modules/layout/lib/Drupal/layout/Access/LayoutAccessCheck.php +++ b/core/modules/layout/lib/Drupal/layout/Access/LayoutAccessCheck.php @@ -9,6 +9,7 @@ use Drupal\Component\Plugin\PluginManagerInterface; use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Session\AccountInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; @@ -44,7 +45,7 @@ public function appliesTo() { /** * {@inheritdoc} */ - public function access(Route $route, Request $request) { + public function access(Route $route, Request $request, AccountInterface $account) { return $this->layoutManager->getDefinition($request->attributes->get('key')) ? static::ALLOW : static::DENY; }