From 394075041c6760984da39d3d62e6cea4b4647726 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Fri, 30 May 2014 21:25:23 +1000 Subject: [PATCH] Add better exception handling for non existent components --- modules/cms/classes/Controller.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index f1dff5782..ee2c5d445 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -265,12 +265,16 @@ class Controller extends BaseController $manager = ComponentManager::instance(); if ($addToLayout) { - $componentObj = $manager->makeComponent($name, $this->layoutObj, $properties); + if (!$componentObj = $manager->makeComponent($name, $this->layoutObj, $properties)) + throw new CmsException(Lang::get('cms::lang.component.not_found', ['name'=>$name])); + $componentObj->alias = $alias; $this->vars[$alias] = $this->layout->components[$alias] = $componentObj; } else { - $componentObj = $manager->makeComponent($name, $this->pageObj, $properties); + if (!$componentObj = $manager->makeComponent($name, $this->pageObj, $properties)) + throw new CmsException(Lang::get('cms::lang.component.not_found', ['name'=>$name])); + $componentObj->alias = $alias; $this->vars[$alias] = $this->page->components[$alias] = $componentObj; }