diff --git a/core/lib/Drupal/Core/Routing/RequestHelper.php b/core/lib/Drupal/Core/Routing/RequestHelper.php index 35a07b1..6b75040 100644 --- a/core/lib/Drupal/Core/Routing/RequestHelper.php +++ b/core/lib/Drupal/Core/Routing/RequestHelper.php @@ -112,7 +112,9 @@ public static function duplicate(Request $original_request, $uri, $method = 'GET } $query_string = http_build_query($query, '', '&'); - $server['REQUEST_URI'] = $components['path'] . ('' !== $query_string ? '?' . $query_string : ''); + // Prepend a ? if there is a query string. + $query_string = $query_string === '' ?: '?' . $query_string; + $server['REQUEST_URI'] = $components['path'] . $query_string; $server['QUERY_STRING'] = $query_string; $request_clone->server->add($server);