projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
907e4dc
)
CRM-21124 fix error on cacheKey when too long
author
eileen
<emcnaughton@wikimedia.org>
Wed, 30 Aug 2017 05:19:17 +0000
(17:19 +1200)
committer
eileen
<emcnaughton@wikimedia.org>
Wed, 30 Aug 2017 05:19:17 +0000
(17:19 +1200)
CRM/Dedupe/Merger.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index 400d3364c6a625a3b0eafe3de9efd371c76001ae..2aff9fea1bd54ef50e6c19351e334c3dabf0fc55 100644
(file)
--- a/
CRM/Dedupe/Merger.php
+++ b/
CRM/Dedupe/Merger.php
@@
-1914,7
+1914,7
@@
INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
$cacheKeyString = "merge {$contactType}";
$cacheKeyString .= $rule_group_id ? "_{$rule_group_id}" : '_0';
$cacheKeyString .= $group_id ? "_{$group_id}" : '_0';
- $cacheKeyString .= !empty($criteria) ?
serialize($criteria
) : '_0';
+ $cacheKeyString .= !empty($criteria) ?
md5(serialize($criteria)
) : '_0';
if ($checkPermissions) {
$contactID = CRM_Core_Session::getLoggedInContactID();
if (!$contactID) {