diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 66afab8..1d9cc29 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -970,6 +970,7 @@ function _menu_link_translate(&$item, $translate = FALSE) { function menu_item_route_access(Route $route, $href, &$map) { $request = Request::create('/' . $href); $request->attributes->set('_system_path', $href); + $request->attributes->set('_account', Drupal::request()->attributes->get('_account')); // Attempt to match this path to provide a fully built request to the // access checker. try { diff --git a/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php b/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php index e698bf4..367d206 100644 --- a/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php +++ b/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php @@ -8,10 +8,10 @@ namespace Drupal\contact\Access; use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Config\ConfigFactory; use Drupal\user\UserDataInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; -use Drupal\Core\Config\ConfigFactory; /** * Access check for contact routes.