projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-13734 fix - Some basic case activities are not reserved
[civicrm-core.git]
/
CRM
/
Dedupe
/
Finder.php
diff --git
a/CRM/Dedupe/Finder.php
b/CRM/Dedupe/Finder.php
index c946ad288089e678af7c4d80e1c4d28f5278f50b..62af0e5e0d3bd6b41f5548e9e677b1d6ea4c474b 100644
(file)
--- a/
CRM/Dedupe/Finder.php
+++ b/
CRM/Dedupe/Finder.php
@@
-1,7
+1,7
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
3
|
+ | CiviCRM version 4.
4
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@
-81,7
+81,7
@@
class CRM_Dedupe_Finder {
*
* @param array $params array of params of the form $params[$table][$field] == $value
* @param string $ctype contact type to match against
*
* @param array $params array of params of the form $params[$table][$field] == $value
* @param string $ctype contact type to match against
- * @param string $used dedupe rule group usage ('Unsupervised' or 'Supervised' or 'General')
+ * @param string $used dedupe rule group usage ('Unsupervised' or 'Supervised' or 'General')
* @param array $except array of contacts that shouldn't be considered dupes
* @param int $ruleGroupID the id of the dedupe rule we should be using
*
* @param array $except array of contacts that shouldn't be considered dupes
* @param int $ruleGroupID the id of the dedupe rule we should be using
*
@@
-201,14
+201,13
@@
class CRM_Dedupe_Finder {
$flat = array();
CRM_Utils_Array::flatten($fields, $flat);
$flat = array();
CRM_Utils_Array::flatten($fields, $flat);
+ // FIXME: This may no longer be necessary - check inputs
$replace_these = array(
'individual_prefix' => 'prefix_id',
'individual_suffix' => 'suffix_id',
'gender' => 'gender_id',
);
$replace_these = array(
'individual_prefix' => 'prefix_id',
'individual_suffix' => 'suffix_id',
'gender' => 'gender_id',
);
- //handle for individual_suffix, individual_prefix, gender
- foreach (array(
- 'individual_suffix', 'individual_prefix', 'gender') as $name) {
+ foreach (array('individual_suffix', 'individual_prefix', 'gender') as $name) {
if (CRM_Utils_Array::value($name, $fields)) {
$flat[$replace_these[$name]] = $flat[$name];
unset($flat[$name]);
if (CRM_Utils_Array::value($name, $fields)) {
$flat[$replace_these[$name]] = $flat[$name];
unset($flat[$name]);