Skip to content

Commit 7776b9c

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: fix merge [Intl] Update ICU data from 74.1 to 75.1 use DeprecatedCallableInfo for Twig callables if possible [Filesystem] Add a warning about `chown()` and `chgrp()` on Windows [String] Update wcswidth data with Unicode 16 PhpSubprocess: Add flag PREG_OFFSET_CAPTURE to preg_match to identify the offset Work around parse_url() bug [Ldap] Clean `ldap_connect()` call in `LdapTestCase` [HttpFoundation] Update links for X-Accel-Redirect and fail properly when X-Accel-Mapping is missing
2 parents f71d98b + fc9dccc commit 7776b9c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Impersonate/ImpersonateUrlGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private function buildPath(?string $targetUri = null, string $identifier = Switc
8181

8282
$targetUri ??= $request->getRequestUri();
8383

84-
$targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => $identifier], '', '&');
84+
$targetUri .= (str_contains($targetUri, '?') ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => $identifier], '', '&');
8585

8686
return $targetUri;
8787
}

0 commit comments

Comments
 (0)