Merge pull request #3285 from nanaya/json_return

Return json on error for a json request
ppy · May 30, 2018 · afdd808 · afdd808
2 parents 2849284 + 76eb16c
commit afdd808
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -108,7 +108,7 @@ public function render($request, Exception $e)
         } else {
             $message = $this->exceptionMessage($e);
 
-            if ($request->ajax()) {
+            if ($request->expectsJson()) {
                 $response = response(['error' => $message]);
             } else {
                 $response = response()->view('layout.error', ['exceptionMessage' => $message]);