X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FDedupe%2FBAO%2FQueryBuilder%2FIndividualSupervised.php;h=fe878ad5b43d947748d1bc7ad154216bc10bd5fa;hb=d8689418f1b8de4dcf29901805c97e27a3081c81;hp=273beaae5faaaba7f5b455b5bb2830350af58c64;hpb=92b0f883315c72514e629b1c9e37261b84186785;p=civicrm-core.git diff --git a/CRM/Dedupe/BAO/QueryBuilder/IndividualSupervised.php b/CRM/Dedupe/BAO/QueryBuilder/IndividualSupervised.php index 273beaae5f..fe878ad5b4 100644 --- a/CRM/Dedupe/BAO/QueryBuilder/IndividualSupervised.php +++ b/CRM/Dedupe/BAO/QueryBuilder/IndividualSupervised.php @@ -1,25 +1,36 @@ params, array()); $civicrm_email = CRM_Utils_Array::value('civicrm_email', $rg->params, array()); $params = array( - 1 => array(CRM_Utils_Array::value('first_name', $civicrm_contact, ''), 'String'), - 2 => array(CRM_Utils_Array::value('last_name', $civicrm_contact, ''), 'String'), - 3 => array(CRM_Utils_Array::value('email', $civicrm_email, ''), 'String'), + 1 => array( + CRM_Utils_Array::value('first_name', $civicrm_contact, ''), + 'String', + ), + 2 => array( + CRM_Utils_Array::value('last_name', $civicrm_contact, ''), + 'String', + ), + 3 => array( + CRM_Utils_Array::value('email', $civicrm_email, ''), + 'String', + ), ); return array( @@ -35,11 +46,13 @@ class CRM_Dedupe_BAO_QueryBuilder_IndividualSupervised extends CRM_Dedupe_BAO_Qu } /** - * @param $rg + * Internal - what do I do. + * + * @param object $rg * * @return array */ - static function internal($rg) { + public static function internal($rg) { $query = " SELECT contact1.id as id1, contact2.id as id2, {$rg->threshold} as weight FROM civicrm_contact as contact1 @@ -52,9 +65,10 @@ class CRM_Dedupe_BAO_QueryBuilder_IndividualSupervised extends CRM_Dedupe_BAO_Qu email1.email=email2.email WHERE contact1.contact_type = 'Individual' AND " . self::internalFilters($rg); - return array("civicrm_contact.{$rg->name}.{$rg->threshold}" => $query); + return array( + "civicrm_contact.{$rg->name}.{$rg->threshold}" => $query + ); } -}; - - +} +;