From e43db21d75e092a61dd6860c713da52c0a02e618 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 4 Jul 2019 10:46:43 +1200
Subject: [PATCH] [REF] clarify  variable

The variable is clearer being defined directly as 'add' or 'modify' in the main function to reduce wrangling
---
 CRM/Core/BAO/CustomField.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index d41a71e1a0f7..e317b50c4aaa 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -153,9 +153,8 @@ public static function dataToHtml() {
    */
   public static function create($params) {
     $transaction = new CRM_Core_Transaction();
-    $op = empty($params['id']) ? 'create' : 'edit';
     $origParams = array_merge([], $params);
-    $params = self::prepareCreate($params, $op);
+    $params = self::prepareCreate($params);
 
     $customField = new CRM_Core_DAO_CustomField();
     $customField->copyValues($params);
@@ -166,13 +165,14 @@ public static function create($params) {
 
     $triggerRebuild = CRM_Utils_Array::value('triggerRebuild', $params, TRUE);
     //create/drop the index when we toggle the is_searchable flag
-    if ($op == 'edit') {
+    $op = empty($params['id']) ? 'add' : 'modify';
+    if ($op == 'modify') {
       $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);
+      self::createField($customField, $op, $indexExist, $triggerRebuild);
     }
     else {
       if (!isset($origParams['column_name'])) {
@@ -183,13 +183,13 @@ public static function create($params) {
       // make sure all values are present in the object
       $customField->find(TRUE);
 
-      self::createField($customField, 'add', FALSE, $triggerRebuild);
+      self::createField($customField, $op, FALSE, $triggerRebuild);
     }
 
     // complete transaction
     $transaction->commit();
 
-    CRM_Utils_Hook::post($op, 'CustomField', $customField->id, $customField);
+    CRM_Utils_Hook::post(($op === 'add' ? 'create' : 'edit'), 'CustomField', $customField->id, $customField);
 
     CRM_Utils_System::flushCache();
 
@@ -1915,12 +1915,11 @@ protected static function createOptionValue(&$params, $value, CRM_Core_DAO_Optio
    * This could be called by a single create or a batchCreate.
    *
    * @param array $params
-   * @param string $op
    *
    * @return array
    */
-  protected static function prepareCreate($params, $op) {
-
+  protected static function prepareCreate($params) {
+    $op = empty($params['id']) ? 'create' : 'edit';
     CRM_Utils_Hook::pre($op, 'CustomField', CRM_Utils_Array::value('id', $params), $params);
     if ($op === 'create') {
       CRM_Core_DAO::setCreateDefaults($params, self::getDefaults());