php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 13:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

asElapsedTime style improvements

Browse Source
This commit is contained in:
David Renty
2014-03-12 16:02:45 +01:00
parent f7871e2458
commit b7cf618348
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
framework/base/Formatter.php
View File

@ -470,16 +470,19 @@ class Formatter extends Component
*/ */
public function asElapsedTime($value) public function asElapsedTime($value)
{ {
if ($value === null) {
return $this->nullDisplay;
}
if ($value instanceof \DateInterval) { if ($value instanceof \DateInterval) {
$interval = $value; $interval = $value;
} else { } else {
if ($value === null) {
return $this->nullDisplay;
}
$value = $this->normalizeDatetimeValue($value); $value = $this->normalizeDatetimeValue($value);
$dateNow = new DateTime('now', new \DateTimeZone($this->timeZone)); $timezone = new \DateTimeZone($this->timeZone);
$dateThen = new DateTime(null, new \DateTimeZone($this->timeZone));
$dateNow = new DateTime('now', $timezone);
$dateThen = new DateTime(null, $timezone);
$dateThen->setTimestamp($value); $dateThen->setTimestamp($value);
$interval = $dateNow->diff($dateThen); $interval = $dateNow->diff($dateThen);