Additional QA Fixes

diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index a8325dc39ac629bd3171cfe283709e58fff4f17b..225d0ceb0941229abf8add7b21498de3f0cc4293 100644 (file)
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -1207,7 +1207,9 @@ ORDER BY civicrm_custom_group.weight,
         }
 
         $fieldId = $field['id'];
-        $elementName = $field['element_name'];
+        if (!empty($field['element_name'])) {
+          $elementName = $field['element_name'];
+        }
         switch ($field['html_type']) {
           case 'Multi-Select':
           case 'AdvMulti-Select':