From 9c976bd2464f6a79cec25d2515aa2c5627a5a958 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 27 Jun 2019 14:59:03 +1200 Subject: [PATCH] [REF] minor code cleanup - move indexExist calculation to the only place in the code that needs it Readability fix --- CRM/Core/BAO/CustomField.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index 36391dba09..a2788068ee 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -175,12 +175,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { } $columnName = $params['column_name']; - $indexExist = FALSE; - //as during create if field is_searchable we had created index. - if (!empty($params['id'])) { - $indexExist = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $params['id'], 'is_searchable'); - } - switch (CRM_Utils_Array::value('html_type', $params)) { case 'Select Date': if (empty($params['date_format'])) { @@ -315,6 +309,11 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { $triggerRebuild = CRM_Utils_Array::value('triggerRebuild', $params, TRUE); //create/drop the index when we toggle the is_searchable flag if ($op == 'edit') { + $indexExist = FALSE; + //as during create if field is_searchable we had created index. + if (!empty($params['id'])) { + $indexExist = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $params['id'], 'is_searchable'); + } self::createField($customField, 'modify', $indexExist, $triggerRebuild); } else { @@ -327,8 +326,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { // make sure all values are present in the object $customField->find(TRUE); - $indexExist = FALSE; - self::createField($customField, 'add', $indexExist, $triggerRebuild); + self::createField($customField, 'add', FALSE, $triggerRebuild); } // complete transaction -- 2.25.1