CRM-13089 - Restore numeric suffix for new (default) column names

---------------------------------------- * CRM-13089: CRM_Core_BAO_CustomField::create overrides user-defined name parameter values http://issues.civicrm.org/jira/browse/CRM-13089
civicrm · Aug 9, 2013 · 79f68e4 · 79f68e4
1 parent 4d32d50
commit 79f68e4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
@@ -130,6 +130,8 @@ static function dataToHtml() {
    * @static
    */
   static function create(&$params) {
+    $origParams = array_merge(array(), $params);
+
     if (!isset($params['id'])) {
       if (!isset($params['column_name'])) {
         // if add mode & column_name not present, calculate it.
@@ -285,6 +287,10 @@ static function create(&$params) {
       self::createField($customField, 'modify', $indexExist);
     }
     else {
+      if (!isset($origParams['column_name'])) {
+        $columnName .= "_{$customField->id}";
+        $params['column_name'] = $columnName;
+      }
       $customField->column_name = $columnName;
       $customField->save();
       // make sure all values are present in the object