From 6923910923001b8a27650e2aadf84e80cc2a94b1 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 26 May 2016 21:00:58 +1200 Subject: [PATCH] CRM-18674 fix date merging for view_only custom fields --- CRM/Dedupe/Merger.php | 6 ++++++ .../v3/{JobTestCustomData.php => JobTestCustomDataTest.php} | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) rename tests/phpunit/api/v3/{JobTestCustomData.php => JobTestCustomDataTest.php} (99%) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 0c7b44646a..5da3c9a442 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1728,6 +1728,12 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m $submitted[$key] = CRM_Core_BAO_CustomField::displayValue($value, $fid); break; + case 'Select Date': + if ($cFields[$fid]['attributes']['is_view']) { + $submitted[$key] = date('YmdHis', strtotime($submitted[$key])); + } + break; + case 'CheckBox': case 'AdvMulti-Select': case 'Multi-Select': diff --git a/tests/phpunit/api/v3/JobTestCustomData.php b/tests/phpunit/api/v3/JobTestCustomDataTest.php similarity index 99% rename from tests/phpunit/api/v3/JobTestCustomData.php rename to tests/phpunit/api/v3/JobTestCustomDataTest.php index 714abbb41c..43001b7f5d 100644 --- a/tests/phpunit/api/v3/JobTestCustomData.php +++ b/tests/phpunit/api/v3/JobTestCustomDataTest.php @@ -44,7 +44,7 @@ * * @group headless */ -class api_v3_JobTestCustomData extends CiviUnitTestCase { +class api_v3_JobTestCustomDataTest extends CiviUnitTestCase { protected $_apiversion = 3; public $_entity = 'Job'; -- 2.25.1