Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Http/Middleware/CheckForRedirects.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@

use AltDesign\AltRedirect\Contracts\RepositoryInterface;
use AltDesign\AltRedirect\Helpers\URISupport;
use Symfony\Component\HttpFoundation\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Uri;
use Closure;
use Illuminate\Http\Request;
use Statamic\Facades\Site;
use Symfony\Component\HttpFoundation\Response;

class CheckForRedirects
{
Expand Down Expand Up @@ -107,16 +109,14 @@ private function redirectWithPreservedParams($to, $status)
// Strip only parameters marked with strip:true, preserve all others
if (! in_array($normalizedKey, $stripKeys) && ! isset($seenKeys[$normalizedKey])) {
$seenKeys[$normalizedKey] = true;
$filteredStrings[] = sprintf('%s=%s', urlencode($key), urlencode($value));
$filteredStrings[$key] = $value;
}
}
}

if ($filteredStrings) {
$to .= str_contains($to, '?') ? '&' : '?';
$to .= implode('&', $filteredStrings);
}
$destinationUri = (new Uri($to))
->withQuery($filteredStrings);

return redirect($to, $status, config('alt-redirect.headers', []));
return redirect((string) $destinationUri , $status, config('alt-redirect.headers', []));
}
}
Loading