TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ApplicationException more friendly

This commit is contained in:
Sam Georges 2014-08-03 10:34:33 +10:00
parent dd3aef93c4
commit 8a86927944
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/backend/classes/Controller.php
View File

@ -378,6 +378,9 @@ class Controller extends Extendable
catch (MassAssignmentException $ex) {
return Response::make(Lang::get('backend::lang.model.mass_assignment_failed', ['attribute' => $ex->getMessage()]), 500);
}
catch (ApplicationException $ex) {
return Response::make($ex->getMessage(), 500);
}
catch (Exception $ex) {
return Response::make(sprintf('"%s" on line %s of %s', $ex->getMessage(), $ex->getLine(), $ex->getFile()), 500);
}

4
modules/cms/classes/Controller.php
View File

@ -19,6 +19,7 @@ use Cms\Twig\Extension as CmsTwigExtension;
use Cms\Classes\FileHelper as CmsFileHelper;
use System\Models\RequestLog;
use System\Classes\ErrorHandler;
use System\Classes\ApplicationException;
use System\Twig\Extension as SystemTwigExtension;
use October\Rain\Support\Markdown;
use October\Rain\Support\ValidationException;
@ -403,6 +404,9 @@ class Controller extends BaseController
$responseContents['X_OCTOBER_ERROR_MESSAGE'] = $ex->getMessage();
return Response::make($responseContents, 406);
}
catch (ApplicationException $ex) {
return Response::make($ex->getMessage(), 500);
}
catch (Exception $ex) {
/*
* Display a "dumbed down" error if custom page is activated