From 645a0241d8e111d4197dc036d299f687b686a426 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sat, 31 Aug 2013 18:06:03 -0700 Subject: [PATCH] CRM_Core_BAO_CustomField - Format --- CRM/Core/BAO/CustomField.php | 37 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index ea5cc53c44..dea4939a8c 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -378,31 +378,25 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @static */ public static function &getFields($customDataType = 'Individual', - $showAll = FALSE, - $inline = FALSE, - $customDataSubType = NULL, - $customDataSubName = NULL, - $onlyParent = FALSE, - $onlySubType = FALSE, - $checkPermission = TRUE + $showAll = FALSE, + $inline = FALSE, + $customDataSubType = NULL, + $customDataSubName = NULL, + $onlyParent = FALSE, + $onlySubType = FALSE, + $checkPermission = TRUE ) { - if ($customDataType && - !is_array($customDataType) - ) { + if ($customDataType && !is_array($customDataType)) { - if (in_array($customDataType, - CRM_Contact_BAO_ContactType::subTypes() - )) { + if (in_array($customDataType, CRM_Contact_BAO_ContactType::subTypes())) { // This is the case when getFieldsForImport() requires fields // limited strictly to a subtype. $customDataSubType = $customDataType; - $customDataType = CRM_Contact_BAO_ContactType::getBasicType($customDataType); - $onlySubType = TRUE; + $customDataType = CRM_Contact_BAO_ContactType::getBasicType($customDataType); + $onlySubType = TRUE; } - if (in_array($customDataType, - array_keys(CRM_Core_SelectValues::customGroupExtends()) - )) { + if (in_array($customDataType, array_keys(CRM_Core_SelectValues::customGroupExtends()))) { // this makes the method flexible to support retrieving fields // for multiple extends value. $customDataType = array($customDataType); @@ -466,11 +460,8 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { if (is_array($customDataType)) { $value = NULL; foreach ($customDataType as $dataType) { - if (in_array($dataType, - array_keys(CRM_Core_SelectValues::customGroupExtends()) - )) { - if (in_array($dataType, array( - 'Individual', 'Household', 'Organization'))) { + if (in_array($dataType, array_keys(CRM_Core_SelectValues::customGroupExtends()))) { + if (in_array($dataType, array('Individual', 'Household', 'Organization'))) { $val = "'" . CRM_Utils_Type::escape($dataType, 'String') . "', 'Contact' "; } else { -- 2.25.1