From 2b39a7a0596f1da37e95ba3b07c0cc3f8b1b5fe3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 20 Feb 2012 16:15:18 +0000
Subject: [PATCH] Fix spreadsheet date/time formatting issue - incorrect
 parsing of user's time

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

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 9bf731492a..fead2ed055 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -1041,7 +1041,7 @@ abstract class bo_merge
 			$key = '$$'.$field.'$$';
 			if($values[$key])
 			{
-				$date = egw_time::createFromFormat($this->datetime_format,$values[$key]);
+				$date = new egw_time($values[$key]);
 				$values[$key] = date('Y-m-d\TH:i:s',egw_time::to($date,'ts'));
 			}
 		}