Skip to content
Merged
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: 9 additions & 5 deletions src/Http/Controllers/FormController.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ private function formSuccess($params, $submission, $silentFailure = false)
]);
}

$response = $redirect && ! \Statamic\Facades\URL::isExternalToApplication($redirect)
? redirect($redirect)
: back();
$response = $redirect ? redirect($redirect) : back();

if (! \Statamic\Facades\URL::isExternal($redirect)) {
session()->flash("form.{$submission->form()->handle()}.success", __('Submission successful.'));
Expand All @@ -169,8 +167,14 @@ private function formSuccess($params, $submission, $silentFailure = false)

private function formSuccessRedirect($params, $submission)
{
if (! $redirect = Form::getSubmissionRedirect($submission)) {
$redirect = Arr::get($params, '_redirect');
if ($redirect = Form::getSubmissionRedirect($submission)) {
return $redirect;
}

$redirect = Arr::get($params, '_redirect');

if ($redirect && \Statamic\Facades\URL::isExternalToApplication($redirect)) {
return null;
}

return $redirect;
Expand Down
Loading