From 3cae4b8a0f3921ef260cd386504a60a5e7808c18 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fl=C3=A1vio=20Veloso?= <flaviovs@magnux.com>
Date: Fri, 2 Sep 2016 15:26:23 -0700
Subject: [PATCH] CRM-19123 Merging contacts: blank date fields write as 1970

----------------------------------------
* CRM-19123: Merging contacts: blank date fields write as 1970
  https://issues.civicrm.org/jira/browse/CRM-19123
---
 CRM/Contact/BAO/Individual.php                |  2 +-
 .../CRM/Contact/BAO/IndividualTest.php        | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tests/phpunit/CRM/Contact/BAO/IndividualTest.php

diff --git a/CRM/Contact/BAO/Individual.php b/CRM/Contact/BAO/Individual.php
index 557b1c563e..824c5f5d0e 100644
--- a/CRM/Contact/BAO/Individual.php
+++ b/CRM/Contact/BAO/Individual.php
@@ -59,7 +59,7 @@ class CRM_Contact_BAO_Individual extends CRM_Contact_DAO_Contact {
 
     // "null" value for example is passed by dedupe merge in order to empty.
     // Display name computation shouldn't consider such values.
-    foreach (array('first_name', 'middle_name', 'last_name', 'nick_name', 'formal_title') as $displayField) {
+    foreach (array('first_name', 'middle_name', 'last_name', 'nick_name', 'formal_title', 'birth_date', 'deceased_date') as $displayField) {
       if (CRM_Utils_Array::value($displayField, $params) == "null") {
         $params[$displayField] = '';
       }
diff --git a/tests/phpunit/CRM/Contact/BAO/IndividualTest.php b/tests/phpunit/CRM/Contact/BAO/IndividualTest.php
new file mode 100644
index 0000000000..cbefedfe14
--- /dev/null
+++ b/tests/phpunit/CRM/Contact/BAO/IndividualTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Class CRM_Contact_BAO_IndividualTest
+ * @group headless
+ */
+class CRM_Contact_BAO_IndividualTest extends CiviUnitTestCase {
+
+  /**
+   * Test case for format() with "null" value dates.
+   *
+   * See CRM-19123: Merging contacts: blank date fields write as 1970
+   */
+  public function testFormatNullDates() {
+    $params = array(
+	    'contact_type' => 'Individual',
+	    'birth_date' => 'null',
+	    'deceased_date' => 'null',
+    );
+    $contact = new CRM_Contact_DAO_Contact();
+
+    CRM_Contact_BAO_Individual::format($params, $contact);
+
+    $this->assertEmpty($contact->birth_date);
+    $this->assertEmpty($contact->deceased_date);
+  }
+}
-- 
2.25.1