projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
CRM-17646 - Refactor out CRM_Core_BAO_CustomField::getDisplayValue
[civicrm-core.git]
/
CRM
/
Dedupe
/
Merger.php
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index e97cac8cece9da35a9ceb25dcfee252ed14d31b7..2933c4153527d95701b7c9e169139503d212b7eb 100644
(file)
--- a/
CRM/Dedupe/Merger.php
+++ b/
CRM/Dedupe/Merger.php
@@
-1647,7
+1647,7
@@
INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
case 'Select Country':
case 'Select State/Province':
- $submitted[$key] = CRM_Core_BAO_CustomField::
getDisplayValue($value, $fid, $cFields
);
+ $submitted[$key] = CRM_Core_BAO_CustomField::
displayValue($value, $fid
);
break;
case 'CheckBox':