diff options
| author | ctrlaltca@gmail.com <> | 2011-05-21 17:10:29 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-05-21 17:10:29 +0000 |
| commit | 6f00b28a1d9c7409c956a83866eac48a9493e83c (patch) | |
| tree | fb3e14f0a527cf32d186932b13bd6ae9ed50a5c1 /framework/Util | |
| parent | 5a91b2a3328c8c15ce9dbed9a599ab87f9e8f112 (diff) | |
branch/3.1: merged bugfixesfrom trunk/ up to r2880; correct svn:mergeinfo property
Diffstat (limited to 'framework/Util')
| -rw-r--r-- | framework/Util/TSimpleDateFormatter.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php index 07a59398..15842f27 100644 --- a/framework/Util/TSimpleDateFormatter.php +++ b/framework/Util/TSimpleDateFormatter.php @@ -301,7 +301,8 @@ class TSimpleDateFormatter }
}
if ($i_val != $this->length($value))
- throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
+ return null;
+ //throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
return null;
else
|