kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Show proper 404 page for JSON.

Browse Source
This commit is contained in:
James Cole
2018-02-10 09:57:56 +01:00
parent 4eb010f807
commit 523ae83811
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Exceptions/Handler.php
View File

@@ -27,6 +27,7 @@ use Exception;
use FireflyIII\Jobs\MailError; use FireflyIII\Jobs\MailError;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Request; use Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* Class Handler * Class Handler
@@ -62,6 +63,10 @@ class Handler extends ExceptionHandler
*/ */
public function render($request, Exception $exception) public function render($request, Exception $exception)
{ {
if ($exception instanceof NotFoundHttpException && $request->expectsJson()) {
return response()->json(['message' => 'Not found'], 404);
}
if ($exception instanceof FireflyException || $exception instanceof ErrorException) { if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
$isDebug = env('APP_DEBUG', false); $isDebug = env('APP_DEBUG', false);