From 6f00b28a1d9c7409c956a83866eac48a9493e83c Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 21 May 2011 17:10:29 +0000
Subject: branch/3.1: merged bugfixesfrom trunk/ up to r2880; correct
 svn:mergeinfo property

---
 framework/Util/TSimpleDateFormatter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'framework/Util/TSimpleDateFormatter.php')

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
-- 
cgit v1.2.3