diff --git a/core/includes/menu.inc b/core/includes/menu.inc index f866aad..ca116de 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -970,7 +970,7 @@ function _menu_link_translate(&$item, $translate = FALSE) { * If the system path in $href does not match the $route. */ function menu_item_route_access(Route $route, $href, &$map) { - $request = RequestHelper::duplicateWithUri(\Drupal::request(), '/' . $href); + $request = RequestHelper::duplicate(\Drupal::request(), '/' . $href); $request->attributes->set('_system_path', $href); // Attempt to match this path to provide a fully built request to the // access checker. diff --git a/core/lib/Drupal/Core/Access/AccessManager.php b/core/lib/Drupal/Core/Access/AccessManager.php index 0236e0a..5e935e0 100644 --- a/core/lib/Drupal/Core/Access/AccessManager.php +++ b/core/lib/Drupal/Core/Access/AccessManager.php @@ -192,7 +192,7 @@ public function checkNamedRoute($route_name, array $parameters = array(), Reques $route = $this->routeProvider->getRouteByName($route_name, $parameters); if (empty($route_request)) { // Create a request and copy the account from the current request. - $route_request = RequestHelper::duplicateWithUri($this->request, $this->urlGenerator->generate($route_name, $parameters)); + $route_request = RequestHelper::duplicate($this->request, $this->urlGenerator->generate($route_name, $parameters)); $defaults = $parameters; $defaults['_account'] = $this->request->attributes->get('_account'); $defaults[RouteObjectInterface::ROUTE_OBJECT] = $route; diff --git a/core/lib/Drupal/Core/Routing/RequestHelper.php b/core/lib/Drupal/Core/Routing/RequestHelper.php index 9f361dc..35a07b1 100644 --- a/core/lib/Drupal/Core/Routing/RequestHelper.php +++ b/core/lib/Drupal/Core/Routing/RequestHelper.php @@ -6,6 +6,7 @@ */ namespace Drupal\Core\Routing; + use Symfony\Component\HttpFoundation\Request; /** @@ -46,7 +47,7 @@ class RequestHelper { * @see \Symfony\Component\HttpFoundation\Request::create() * @see \Symfony\Component\HttpFoundation\Request::duplicate() */ - public static function duplicateWithUri(Request $original_request, $uri, $method = 'GET', $parameters = array(), array $query = NULL, array $request = NULL, array $attributes = NULL, array $cookies = NULL, array $files = NULL, array $server = NULL) { + public static function duplicate(Request $original_request, $uri, $method = 'GET', $parameters = array(), array $query = NULL, array $request = NULL, array $attributes = NULL, array $cookies = NULL, array $files = NULL, array $server = NULL) { $request_clone = $original_request->duplicate($query, $request, $attributes, $cookies, $files, $server); $server = array(); @@ -121,4 +122,4 @@ public static function duplicateWithUri(Request $original_request, $uri, $method return $request_clone; } -} +}