X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FComponent.php;h=c594c3b6d8ab8edc725eaccd1e2da35193ccdf81;hb=1aaadbcc9ff73774f08ddd7ad65a81929a37ab16;hp=b96694a43d5a38c4f6cc74d24d9a085b99163b45;hpb=13ee86fb737e0aa0977e890654dcb651a742d274;p=civicrm-core.git diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php index b96694a43d..c594c3b6d8 100644 --- a/CRM/Core/Component.php +++ b/CRM/Core/Component.php @@ -70,7 +70,7 @@ class CRM_Core_Component { * @param bool $force * * @return CRM_Core_Component_Info[] - * @throws Exception + * @throws CRM_Core_Exception */ public static function &getComponents($force = FALSE) { if (!isset(Civi::$statics[__CLASS__]['all']) || $force) { @@ -87,7 +87,7 @@ class CRM_Core_Component { require_once $infoClassFile; $infoObject = new $infoClass($cr->name, $cr->namespace, $cr->id); if ($infoObject->info['name'] !== $cr->name) { - CRM_Core_Error::fatal("There is a discrepancy between name in component registry and in info file ({$cr->name})."); + throw new CRM_Core_Exception("There is a discrepancy between name in component registry and in info file ({$cr->name})."); } Civi::$statics[__CLASS__]['all'][$cr->name] = $infoObject; unset($infoObject);