X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FComponent.php;h=85c69308675466cdbdfeec609a8ae5ea497de122;hb=5c4d65599fee6dfdf661b4932d12c5905e60ac90;hp=0a7fe2a69c2ff8ee1c6da718af105dee06082e90;hpb=f9f40af3ba65d47c6710d450e989124d9b3e3b70;p=civicrm-core.git diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php index 0a7fe2a69c..85c6930867 100644 --- a/CRM/Core/Component.php +++ b/CRM/Core/Component.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * Component stores all the static and dynamic information of the various @@ -230,7 +230,7 @@ class CRM_Core_Component { $cfg = $comp->getConfigObject(); $cfg->add($config, $oldMode); } - return; + return NULL; } /** @@ -275,8 +275,8 @@ class CRM_Core_Component { $fields = array(); foreach ($info as $name => $comp) { if ($comp->usesSearch()) { - $bqr = $comp->getBAOQueryObject(); - $flds = $bqr->getFields(); + $bqr = $comp->getBAOQueryObject(); + $flds = $bqr->getFields(); $fields = array_merge($fields, $flds); } } @@ -327,7 +327,7 @@ class CRM_Core_Component { * * @return null */ - static function &defaultReturnProperties( + public static function &defaultReturnProperties( $mode, $includeCustomFields = TRUE ) { @@ -423,8 +423,6 @@ class CRM_Core_Component { * @param array $tables * Array of tables. * - * @return null - * @static */ public static function tableNames(&$tables) { $info = self::_info(); @@ -439,7 +437,6 @@ class CRM_Core_Component { /** * Get components info from info file - * */ public static function getComponentsFromFile($crmFolderDir) { $components = array(); @@ -464,4 +461,5 @@ class CRM_Core_Component { return $components; } + }