From 3d88485ec81d6a6d12e1c9758c7add9797978d8a Mon Sep 17 00:00:00 2001 From: Dave Jenkins Date: Wed, 9 Oct 2013 23:30:48 +0100 Subject: [PATCH] CRM-8338 removed CRM_Contact_Form_Task_Label::mergeSameHousehold(), made obsolete by CRM_Contact_Form_Task::mergeContactIdsByHousehold() implemented in previous commit. ---------------------------------------- * CRM-8338: Mailing Label Household Merge requires Household to be selected as well as individuals http://issues.civicrm.org/jira/browse/CRM-8338 --- CRM/Contact/Form/Task/Label.php | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/CRM/Contact/Form/Task/Label.php b/CRM/Contact/Form/Task/Label.php index deebe1898d..d36c4efd6f 100644 --- a/CRM/Contact/Form/Task/Label.php +++ b/CRM/Contact/Form/Task/Label.php @@ -480,36 +480,5 @@ class CRM_Contact_Form_Task_Label extends CRM_Contact_Form_Task { $rows[$data['ID']]['addressee'] = $rows[$data['ID']]['addressee_display'] = $rows[$data['ID']]['display_name'] = $processedNames; } } - - function mergeSameHousehold(&$rows) { - # group selected contacts by type - $individuals = array(); - $households = array(); - foreach ($rows as $contact_id => $row) { - if ($row['contact_type'] == 'Household') { - $households[$contact_id] = $row; - } - elseif ($row['contact_type'] == 'Individual') { - $individuals[$contact_id] = $row; - } - } - - # exclude individuals belonging to selected households - foreach ($households as $household_id => $row) { - $dao = new CRM_Contact_DAO_Relationship(); - $dao->contact_id_b = $household_id; - $dao->find(); - while ($dao->fetch()) { - $individual_id = $dao->contact_id_a; - if (array_key_exists($individual_id, $individuals)) { - unset($individuals[$individual_id]); - } - } - } - - # merge back individuals and households - $rows = array_merge($individuals, $households); - return $rows; - } } -- 2.25.1