diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index 891bd9282..bdb91acb7 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -15,7 +15,6 @@ use BackendAuth; use Backend\Models\UserPreference; use Backend\Models\Preference as BackendPreference; use Cms\Widgets\MediaManager; -use System\Classes\ErrorHandler; use October\Rain\Exception\AjaxException; use October\Rain\Exception\SystemException; use October\Rain\Exception\ValidationException; @@ -37,13 +36,9 @@ class Controller extends Extendable use \System\Traits\AssetMaker; use \System\Traits\ConfigMaker; use \System\Traits\EventEmitter; + use \Backend\Traits\ErrorMaker; use \Backend\Traits\WidgetMaker; - /** - * @var string Object used for storing a fatal error. - */ - protected $fatalError; - /** * @var object Reference the logged in admin user. */ @@ -610,16 +605,6 @@ class Controller extends Extendable return $this; } - /** - * Sets standard page variables in the case of a controller error. - */ - public function handleError($exception) - { - $errorMessage = ErrorHandler::getDetailedMessage($exception); - $this->fatalError = $errorMessage; - $this->vars['fatalError'] = $errorMessage; - } - // // Hints // diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index e34fa2f4d..b0c0ff68f 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -18,6 +18,7 @@ abstract class WidgetBase extends Extendable use \System\Traits\AssetMaker; use \System\Traits\ConfigMaker; use \System\Traits\EventEmitter; + use \Backend\Traits\ErrorMaker; use \Backend\Traits\WidgetMaker; use \Backend\Traits\SessionMaker; diff --git a/modules/backend/traits/ErrorMaker.php b/modules/backend/traits/ErrorMaker.php new file mode 100644 index 000000000..61146bb1f --- /dev/null +++ b/modules/backend/traits/ErrorMaker.php @@ -0,0 +1,28 @@ +fatalError = $errorMessage; + $this->vars['fatalError'] = $errorMessage; + } +} diff --git a/modules/system/traits/ViewMaker.php b/modules/system/traits/ViewMaker.php index 8d88f9214..02b3f9b3a 100644 --- a/modules/system/traits/ViewMaker.php +++ b/modules/system/traits/ViewMaker.php @@ -13,10 +13,9 @@ use Symfony\Component\Debug\Exception\FatalThrowableError; * View Maker Trait * Adds view based methods to a class * - * @package october\backend + * @package october\system * @author Alexey Bobkov, Samuel Georges */ - trait ViewMaker { /**