From 00aca32377dfe3ec4040dc480fcf0b71adb4a6f5 Mon Sep 17 00:00:00 2001
From: francescbassas <francesc@babu.cat>
Date: Wed, 27 Jul 2016 00:24:28 +0200
Subject: [PATCH] CRM-19133 Unassigning contact subtype for a custom group
 causes data loss

---
 CRM/Custom/Form/Group.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php
index a42fd73f8d..4f733a5869 100644
--- a/CRM/Custom/Form/Group.php
+++ b/CRM/Custom/Form/Group.php
@@ -461,7 +461,8 @@ class CRM_Custom_Form_Group extends CRM_Core_Form {
 
       if (!empty($this->_subtypes)) {
         $subtypesToBeRemoved = array_diff($this->_subtypes, array_intersect($this->_subtypes, $params['extends'][1]));
-        CRM_Contact_BAO_ContactType::deleteCustomRowsOfSubtype($this->_id, $subtypesToBeRemoved);
+        $subtypesToPreserve = $params['extends'][1];
+        CRM_Contact_BAO_ContactType::deleteCustomRowsOfSubtype($this->_id, $subtypesToBeRemoved, $subtypesToPreserve);
       }
     }
     elseif ($this->_action & CRM_Core_Action::ADD) {
-- 
2.25.1