Skip to content

Commit

Permalink
Return 500 on exception during asset combining (#4142)
Browse files Browse the repository at this point in the history
Credit to @alekseyp
  • Loading branch information
alekseyp authored and LukeTowers committed Feb 27, 2019
1 parent 57a0743 commit 8ea36ea
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion modules/system/classes/SystemController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use ApplicationException;
use Illuminate\Routing\Controller as ControllerBase;
use Exception;
use Response;

/**
* The is the master controller for system related routing.
Expand Down Expand Up @@ -36,7 +37,7 @@ public function combine($name)

}
catch (Exception $ex) {
return '/* '.e($ex->getMessage()).' */';
return Response::make('/* '.e($ex->getMessage()).' */', 500);
}
}
}

0 comments on commit 8ea36ea

Please sign in to comment.