[4.x] Check if form request wantsJson (#9533)

statamic · Feb 20, 2024 · e0d10d5 · e0d10d5
1 parent 8c2a481
commit e0d10d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
@@ -98,7 +98,7 @@ private function validateContentType($request, $form)
      */
     private function formFailure($params, $errors, $form)
     {
-        if (request()->ajax()) {
+        if (request()->ajax() || request()->wantsJson()) {
             return response([
                 'errors' => (new MessageBag($errors))->all(),
                 'error' => collect($errors)->map(function ($errors, $field) {

diff --git a/src/Http/Requests/FrontendFormRequest.php b/src/Http/Requests/FrontendFormRequest.php
@@ -60,7 +60,7 @@ public function validator()
 
     protected function failedValidation(Validator $validator)
     {
-        if ($this->ajax()) {
+        if ($this->ajax() || $this->wantsJson()) {
             $errors = $validator->errors();
 
             $response = response([