Index: branches/5.1.x/core/kernel/utility/formatters/date_formatter.php
===================================================================
diff -u -N -r13613 -r14130
--- branches/5.1.x/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 13613)
+++ branches/5.1.x/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 14130)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: date_formatter.php 13613 2010-05-24 18:56:24Z alex $
+* @version	$Id: date_formatter.php 14130 2011-01-09 14:38:47Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -219,7 +219,14 @@
 			return adodb_gmdate($options['format'], $value);
 		}
 
-		return adodb_date($options['format'], $value);
+		$format = $options['format'];
+		$dt_separator = getArrayValue($options, 'date_time_separator');
+
+		if ($dt_separator) {
+			$format = trim($format, $dt_separator);
+		}
+
+		return adodb_date($format, $value);
 	}
 
 	function HumanFormat($format)
Index: branches/5.1.x/core/units/custom_data/custom_data_event_handler.php
===================================================================
diff -u -N -r13962 -r14130
--- branches/5.1.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 13962)
+++ branches/5.1.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 14130)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_data_event_handler.php 13962 2010-09-25 18:38:45Z alex $
+* @version	$Id: custom_data_event_handler.php 14130 2011-01-09 14:38:47Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -163,6 +163,12 @@
 
 				switch ($custom_params['ElementType']) {
 					case 'date':
+						unset($field_options['options']);
+						$field_options['formatter'] = 'kDateFormatter';
+						$field_options['input_time_format'] = '';
+						$field_options['time_format'] = '';
+						break;
+
 					case 'datetime':
 						unset($field_options['options']);
 						$field_options['formatter'] = 'kDateFormatter';