diff options
Diffstat (limited to 'framework/Util')
| -rw-r--r-- | framework/Util/TSimpleDateFormatter.php | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php index 052e0074..2a3da63a 100644 --- a/framework/Util/TSimpleDateFormatter.php +++ b/framework/Util/TSimpleDateFormatter.php @@ -190,18 +190,20 @@ class TSimpleDateFormatter  	/**
  	 * Parse the string according to the pattern.
 -	 * @param string date string to parse
 +	 * @param string|int date string or integer to parse
  	 * @return int date time stamp
  	 * @throws TInvalidDataValueException if date string is malformed.
  	 */
  	public function parse($value,$defaultToCurrentTime=true)
  	{
 -		if(!is_string($value))
 +		if(is_int($value))
 +			return $value;
 +		else if(!is_string($value))
  			throw new TInvalidDataValueException('date_to_parse_must_be_string', $value);
  		if(empty($this->pattern)) return time();
 -		$date = $this->getDate(time());
 +		$date = time();
  		if($this->length(trim($value)) < 1)
  			return $defaultToCurrentTime ? $date : null;
  | 
