From 1b07e20fd47ce97c2cf205fc394a91a02564e4fc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 24 Jul 2012 18:32:27 +0000
Subject: [PATCH] Fix date formatting, remove time from date only custom field

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

diff --git a/filemanager/inc/class.filemanager_merge.inc.php b/filemanager/inc/class.filemanager_merge.inc.php
index b3f6d22fce..9783fe5144 100644
--- a/filemanager/inc/class.filemanager_merge.inc.php
+++ b/filemanager/inc/class.filemanager_merge.inc.php
@@ -123,7 +123,7 @@ class filemanager_merge extends bo_merge
 				// Format date cfs per user preferences
 				if($field['type'] == 'date' || $field['type'] == 'date-time')
 				{
-					$file['#'.$name] = egw_time::to($file['#'.$name]);
+					$file['#'.$name] = egw_time::to($file['#'.$name], $field['type'] == 'date' ? true : '');
 				}
 			}
                 }