diff options
| author | xue <> | 2006-04-14 12:55:01 +0000 |
|---|---|---|
| committer | xue <> | 2006-04-14 12:55:01 +0000 |
| commit | a66e3a8afb63d472b3ec92a406538dfc0a492efb (patch) | |
| tree | a7b78fef549ee487027133f3db7095aabbe97dba /framework/Util | |
| parent | f6a5e7589396854e10e023c25237b47e512ff047 (diff) | |
merge from branch 3.0 till 908.
Diffstat (limited to 'framework/Util')
| -rw-r--r-- | framework/Util/TSimpleDateFormatter.php | 2 |
1 files changed, 1 insertions, 1 deletions
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);
}
/**
|