From 3d5ac964b590c53a7d2af449977cdb1dfd3ab25e Mon Sep 17 00:00:00 2001 From: francescbassas Date: Wed, 27 Jul 2016 13:15:34 +0200 Subject: [PATCH] Fixes Jenkins warnings --- CRM/Contact/BAO/ContactType.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CRM/Contact/BAO/ContactType.php b/CRM/Contact/BAO/ContactType.php index 7b0dece4ba..d9193f9ba4 100644 --- a/CRM/Contact/BAO/ContactType.php +++ b/CRM/Contact/BAO/ContactType.php @@ -893,7 +893,7 @@ WHERE extends = %1 AND " . implode(" OR ", $subTypeClause); * * @return bool */ - public static function deleteCustomRowsOfSubtype($gID, $subtypes = array(), $subtypesToPreserve = array() ) { + public static function deleteCustomRowsOfSubtype($gID, $subtypes = array(), $subtypesToPreserve = array()) { if (!$gID or empty($subtypes)) { return FALSE; } @@ -902,19 +902,18 @@ WHERE extends = %1 AND " . implode(" OR ", $subTypeClause); // drop triggers CRM-13587 CRM_Core_DAO::dropTriggers($tableName); - + foreach ($subtypesToPreserve as $subtypeToPreserve) { - $subtypeToPreserve = CRM_Utils_Type::escape($subtypeToPreserve, 'String'); - $subtypesToPreserveClause[] = "( civicrm_contact.contact_sub_type NOT LIKE '%" . CRM_Core_DAO::VALUE_SEPARATOR . $subtypeToPreserve . CRM_Core_DAO::VALUE_SEPARATOR . "%')"; + $subtypeToPreserve = CRM_Utils_Type::escape($subtypeToPreserve, 'String'); + $subtypesToPreserveClause[] = "(civicrm_contact.contact_sub_type NOT LIKE '%" . CRM_Core_DAO::VALUE_SEPARATOR . $subtypeToPreserve . CRM_Core_DAO::VALUE_SEPARATOR . "%')"; } $subtypesToPreserveClause = implode(' AND ', $subtypesToPreserveClause); - $subtypeClause = array(); foreach ($subtypes as $subtype) { $subtype = CRM_Utils_Type::escape($subtype, 'String'); $subtypeClause[] = "( civicrm_contact.contact_sub_type LIKE '%" . CRM_Core_DAO::VALUE_SEPARATOR . $subtype . CRM_Core_DAO::VALUE_SEPARATOR . "%'" - . " AND " . $subtypesToPreserveClause . ")"; + . " AND " . $subtypesToPreserveClause . ")"; } $subtypeClause = implode(' OR ', $subtypeClause); -- 2.25.1