Skip to content

Commit

Permalink
Merge branch '6.4' into 7.1
Browse files Browse the repository at this point in the history
* 6.4:
  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
  • Loading branch information
xabbuh committed Sep 15, 2024
2 parents acd1ecc + 2ea5b04 commit fc9dccc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Impersonate/ImpersonateUrlGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private function buildPath(?string $targetUri = null, string $identifier = Switc

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

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

return $targetUri;
}
Expand Down

0 comments on commit fc9dccc

Please sign in to comment.