From: eileen <eileen@fuzion.co.nz>
Date: Thu, 30 May 2013 05:06:56 +0000 (+1200)
Subject: CRM-12715 e-notice observed on merge page
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0f6fa7a89255181ff7a7c738b70caa213cef3b41;p=civicrm-core.git

CRM-12715 e-notice observed on merge page
---

diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index e35351d607..5f93efbc77 100644
--- a/CRM/Contact/Form/Merge.php
+++ b/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]])
       );