From a66e3a8afb63d472b3ec92a406538dfc0a492efb Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 14 Apr 2006 12:55:01 +0000 Subject: merge from branch 3.0 till 908. --- framework/Util/TSimpleDateFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'framework/Util') diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php index ce92a272..7be49bc9 100644 --- a/framework/Util/TSimpleDateFormatter.php +++ b/framework/Util/TSimpleDateFormatter.php @@ -292,7 +292,7 @@ class TSimpleDateFormatter if(!$defaultToCurrentTime && (is_null($month) || is_null($day) || is_null($year))) return null; else - return $this->getDate(@mktime(0, 0, 0, $month, $day, $year)); + return @mktime(0, 0, 0, $month, $day, $year); } /** -- cgit v1.2.3