From: Eileen Date: Thu, 2 Jan 2014 04:17:16 +0000 (+1300) Subject: more tabs replaced with double spaces X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2dd1b7302d2bd6a48a09aac3ade2f2e3c3479520;p=civicrm-core.git more tabs replaced with double spaces --- diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index 50a76e1475..decb24753c 100755 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -905,7 +905,7 @@ WHERE reminder.action_schedule_id = %1 AND reminder.action_date_time IS NULL // Need to check if its a smart group or not // Then decide which table to join onto the query - $group = CRM_Contact_DAO_Group::getTableName(); + $group = CRM_Contact_DAO_Group::getTableName(); // Get the group information $sql = " diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index 1e89e8a3c1..c56c9a9433 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -742,13 +742,13 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { } $field = self::getFieldObject($fieldId); - + // Custom field HTML should indicate group+field name $groupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $field->custom_group_id); $dataCrmCustomVal = $groupName.':'.$field->name; $dataCrmCustomAttr = 'data-crm-custom="'.$dataCrmCustomVal.'"'; $field->attributes .= $dataCrmCustomAttr; - + // Fixed for Issue CRM-2183 if ($field->html_type == 'TextArea' && $search) { $field->html_type = 'Text'; @@ -831,7 +831,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { 'timeFormat' => $field->time_format, 'startOffset' => $field->start_date_years, 'endOffset' => $field->end_date_years, - 'data-crm-custom' => $dataCrmCustomVal, + 'data-crm-custom' => $dataCrmCustomVal, )); } break; @@ -889,7 +889,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { 'size' => 5, 'style' => '', 'class' => 'advmultiselect', - 'data-crm-custom' => $dataCrmCustomVal, + 'data-crm-custom' => $dataCrmCustomVal, ) ); @@ -1557,7 +1557,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { if (is_array($customFieldExtend)) { $customFieldExtend = $customFieldExtend[0]; } - + if (in_array($customFieldExtend, CRM_Contact_BAO_ContactType::subTypes() )) { diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php index 2fbf146897..2f89e752ad 100644 --- a/CRM/Core/Component.php +++ b/CRM/Core/Component.php @@ -98,9 +98,9 @@ class CRM_Core_Component { static public function &getEnabledComponents($force = FALSE) { return self::_info($force); } - + static public function flushEnabledComponents() { - self::getEnabledComponents(TRUE); + self::getEnabledComponents(TRUE); } public static function &getNames($translated = FALSE) {