From: mmikitka <matt@mikitka.net>
Date: Fri, 9 Aug 2013 04:00:48 +0000 (-0400)
Subject: Fixed bug https://github.com/civicrm/civicrm-core/pull/1206#issuecomment-21285959
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8001040de7234831e83c42dc6afb945afa361cc9;p=civicrm-core.git

Fixed bug https://github.com/civicrm/civicrm-core/pull/1206#issuecomment-21285959
---

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 77e306f909..0242979aea 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -145,6 +145,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
         'column_name'
       );
     }
+    $columnName = $params['column_name'];
 
     $indexExist = FALSE;
     //as during create if field is_searchable we had created index.
@@ -284,9 +285,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
       self::createField($customField, 'modify', $indexExist);
     }
     else {
-      if (!isset($params['column_name'])) {
-        $columnName .= "_{$customField->id}";
-      }
       $customField->column_name = $columnName;
       $customField->save();
       // make sure all values are present in the object