MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-17 05:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/api-v1

Browse Source
This commit is contained in:
Dane Everitt
2017-12-31 10:32:28 -06:00
parent 54b6fb5ebd 6b2d7b6488
commit 46d7ba7585
32 changed files with 247 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exceptions/DisplayException.php
View File

@@ -65,7 +65,7 @@ class DisplayException extends PterodactylException
if ($request->expectsJson()) {
return response()->json(Handler::convertToArray($this, [
'detail' => $this->getMessage(),
]), 500);
]), method_exists($this, 'getStatusCode') ? $this->getStatusCode() : 500);
}
app()->make(AlertsMessageBag::class)->danger($this->getMessage())->flash();