Merge pull request #990 from eileenmcnaughton/CRM-12715

Crm 12715 fix custom date rendering for is_multiple custom groups

CRM/Contact/Form/Merge.php

@@ -193,12 +193,12 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
     $subtypes = CRM_Contact_BAO_ContactType::subTypePairs(NULL, TRUE, '');
 
     $this->assign('contact_type', $main['contact_type']);
-    if (isset($main['contact_sub_type'])) {
+    if (!empty($main['contact_sub_type'])) {
       $this->assign('main_contact_subtype',
         CRM_Utils_Array::value('contact_sub_type', $subtypes[$main['contact_sub_type'][0]])
       );
     }
-    if (isset($other['contact_sub_type'])) {
+    if (!empty($other['contact_sub_type'])) {
       $this->assign('other_contact_subtype',
         CRM_Utils_Array::value('contact_sub_type', $subtypes[$other['contact_sub_type'][0]])
       );