From 9bfe20b00847b187d4061ab4f96e5bda8013d5a5 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 1 Feb 2018 10:44:17 -0700
Subject: [PATCH] * Infolog - Fix merging empty custom date fields filled them
 with current date

---
 infolog/inc/class.infolog_merge.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php
index dabace9d72..6a206a3e68 100644
--- a/infolog/inc/class.infolog_merge.inc.php
+++ b/infolog/inc/class.infolog_merge.inc.php
@@ -114,7 +114,7 @@ class infolog_merge extends Api\Storage\Merge
 				$array['#'.$name] = '';
 			}
 			// Format date cfs per user Api\Preferences
-			if($field['type'] == 'date' || $field['type'] == 'date-time')
+			if($array['#'.$name] && ($field['type'] == 'date' || $field['type'] == 'date-time'))
 			{
 				$this->date_fields[] = '#'.$name;
 				$array['#'.$name] = Api\DateTime::to($array['#'.$name], $field['type'] == 'date' ? true : '');