diff --git a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php index f990ed4..8d50414 100644 --- a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php @@ -39,13 +39,13 @@ public function __construct(AccessManager $access_manager) { */ public function onKernelRequestAccessCheck(GetResponseEvent $event) { $request = $event->getRequest(); - if (!$request->attributes->has('_route_object')) { + if (!$request->attributes->has('_route')) { // If no Route is available it is likely a static resource and access is // handled elsewhere. return; } - $this->accessManager->check($request->attributes->get('_route_object')); + $this->accessManager->check($request->attributes->get('_route')); } /** diff --git a/core/lib/Drupal/Core/Routing/FirstEntryFinalMatcher.php b/core/lib/Drupal/Core/Routing/FirstEntryFinalMatcher.php index c57422e..de7878f 100644 --- a/core/lib/Drupal/Core/Routing/FirstEntryFinalMatcher.php +++ b/core/lib/Drupal/Core/Routing/FirstEntryFinalMatcher.php @@ -53,7 +53,7 @@ public function matchRequest(Request $request) { preg_match($compiled->getRegex(), $path, $matches); - return array_merge($this->mergeDefaults($matches, $route->getDefaults()), array('_route' => $name, '_route_object' => $route)); + return array_merge($this->mergeDefaults($matches, $route->getDefaults()), array('_route' => $route)); } }