|
|
@ -672,9 +672,7 @@ class Formatter extends Component |
|
|
|
} |
|
|
|
} |
|
|
|
try { |
|
|
|
try { |
|
|
|
if (is_numeric($value)) { // process as unix timestamp, which is always in UTC |
|
|
|
if (is_numeric($value)) { // process as unix timestamp, which is always in UTC |
|
|
|
$timestamp = new DateTime(); |
|
|
|
$timestamp = new DateTime('@' . $value, new DateTimeZone('UTC')); |
|
|
|
$timestamp->setTimezone(new DateTimeZone('UTC')); |
|
|
|
|
|
|
|
$timestamp->setTimestamp($value); |
|
|
|
|
|
|
|
return $checkTimeInfo ? [$timestamp, true] : $timestamp; |
|
|
|
return $checkTimeInfo ? [$timestamp, true] : $timestamp; |
|
|
|
} elseif (($timestamp = DateTime::createFromFormat('Y-m-d', $value, new DateTimeZone($this->defaultTimeZone))) !== false) { // try Y-m-d format (support invalid dates like 2012-13-01) |
|
|
|
} elseif (($timestamp = DateTime::createFromFormat('Y-m-d', $value, new DateTimeZone($this->defaultTimeZone))) !== false) { // try Y-m-d format (support invalid dates like 2012-13-01) |
|
|
|
return $checkTimeInfo ? [$timestamp, false] : $timestamp; |
|
|
|
return $checkTimeInfo ? [$timestamp, false] : $timestamp; |
|
|
|