From 5affa62e6c92a353ba7bafd767aec58d18593955 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Tue, 16 Jun 2009 23:31:12 +0000 Subject: [PATCH] BUGFIX Made date fixes for MSSQLDatabase more robust in DataObject::__construct() git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79375 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/DataObject.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/model/DataObject.php b/core/model/DataObject.php index 036259a83..a87422459 100644 --- a/core/model/DataObject.php +++ b/core/model/DataObject.php @@ -265,13 +265,13 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity // MSSQLDatabase::date() uses datetime for the data type for "Date" and "SSDatetime" switch($this->db($k)) { case "Date": - $v = preg_replace('/([ap]m)$/i', ' \\1', $v); + $v = preg_replace('/:[0-9][0-9][0-9]([ap]m)$/i', ' \\1', $v); $record[$k] = date('Y-m-d', strtotime($v)); break; case "Datetime": case "SSDatetime": - $v = preg_replace('/([ap]m)$/i', ' \\1', $v); + $v = preg_replace('/:[0-9][0-9][0-9]([ap]m)$/i', ' \\1', $v); $record[$k] = date('Y-m-d H:i:s', strtotime($v)); break; }