OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue introduced with league/uri library

Browse Source
This commit is contained in:
Alejandro Celaya
2020-07-10 23:25:31 +02:00
parent 36c12a69b1
commit 1401dd9156
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/Core/src/Action/AbstractTrackingAction.php
View File

@@ -68,13 +68,13 @@ abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMet
private function buildUrlToRedirectTo(ShortUrl $shortUrl, array $currentQuery, ?string $disableTrackParam): string private function buildUrlToRedirectTo(ShortUrl $shortUrl, array $currentQuery, ?string $disableTrackParam): string
{ {
$uri = Uri::createFromString($shortUrl->getLongUrl()); $uri = Uri::createFromString($shortUrl->getLongUrl());
$hardcodedQuery = parse_query($uri->getQuery()); $hardcodedQuery = parse_query($uri->getQuery() ?? '');
if ($disableTrackParam !== null) { if ($disableTrackParam !== null) {
unset($currentQuery[$disableTrackParam]); unset($currentQuery[$disableTrackParam]);
} }
$mergedQuery = array_merge($hardcodedQuery, $currentQuery); $mergedQuery = array_merge($hardcodedQuery, $currentQuery);
return (string) $uri->withQuery(build_query($mergedQuery)); return (string) (empty($mergedQuery) ? $uri : $uri->withQuery(build_query($mergedQuery)));
} }
private function shouldTrackRequest(ServerRequestInterface $request, array $query, ?string $disableTrackParam): bool private function shouldTrackRequest(ServerRequestInterface $request, array $query, ?string $disableTrackParam): bool