Index: branches/5.2.x/core/kernel/utility/formatters/date_formatter.php
===================================================================
diff -u -N -r14244 -r14572
--- branches/5.2.x/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 14244)
+++ branches/5.2.x/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 14572)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: date_formatter.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: date_formatter.php 14572 2011-09-20 15:25:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -232,11 +232,23 @@
 			$options['format'] = $this->language->GetDBField($regs[1]);
 		}
 
+		if ($options['format'] == '_input_') {
+			// use input format instead of output format
+			$options['format'] = $options['input_format'];
+		}
+
 		if (!$options['use_timezone']) {
 			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)