CRM-18674 fix date merging for view_only custom fields

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 0c7b44646a5302270725232dc13f1fff184b96f8..5da3c9a4425fdd5f2a556e46cf2888ddc5b7e330 100644 (file)
--- 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 714abbb41c4166d6564c2731f2c21799724c46f1..43001b7f5d65f5c6e7a616d1af28888ccf4357e4 100644 (file)
--- 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';