From 8a8692794428038669cbf88e7362b80b5a5038d3 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Sun, 3 Aug 2014 10:34:33 +1000 Subject: [PATCH] Make ApplicationException more friendly --- modules/backend/classes/Controller.php | 3 +++ modules/cms/classes/Controller.php | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index 366d2b403..03b59e408 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -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); } diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index cce7b120b..045fb75a6 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -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