From ea00eb2ea27613491eb517be9659059696fb335b Mon Sep 17 00:00:00 2001 From: ctrlaltca <> Date: Sun, 6 Jan 2013 19:16:09 +0000 Subject: backpotder r3238, r3239 to trunk/ --- framework/Util/TSimpleDateFormatter.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'framework/Util/TSimpleDateFormatter.php') diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php index 8b17048a..a1a1842a 100644 --- a/framework/Util/TSimpleDateFormatter.php +++ b/framework/Util/TSimpleDateFormatter.php @@ -173,15 +173,8 @@ class TSimpleDateFormatter */ private function getDate($value) { - if(!is_string($value)) - { - $s = Prado::createComponent('System.Util.TDateTimeStamp'); - return $s->getDate($value); - } - $date = @strtotime($value); - if($date < 0) - throw new TInvalidDataValueException('invalid_date', $value); - return @getdate($date); + $s = Prado::createComponent('System.Util.TDateTimeStamp'); + return $s->parseDate($value); } /** -- cgit v1.2.3