Skip to content

Commit 438f420

Browse files
committed
Consolidate code per review
1 parent 6829f97 commit 438f420

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

system/I18n/Time.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,19 +1253,18 @@ public function getUTCObject($time, string $timezone = null)
12531253
{
12541254
if ($time instanceof Time)
12551255
{
1256-
$time = $time->toDateTime()
1257-
->setTimezone(new DateTimeZone('UTC'));
1258-
}
1259-
elseif ($time instanceof DateTime || $time instanceof DateTimeImmutable)
1260-
{
1261-
$time = $time->setTimezone(new DateTimeZone('UTC'));
1256+
$time = $time->toDateTime();
12621257
}
12631258
elseif (is_string($time))
12641259
{
12651260
$timezone = $timezone ?: $this->timezone;
12661261
$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
12671262
$time = new DateTime($time, $timezone);
1268-
$time = $time->setTimezone(new DateTimeZone('UTC'));
1263+
}
1264+
1265+
if ($time instanceof DateTime || $time instanceof DateTimeImmutable)
1266+
{
1267+
$time = $time->setTimezone(new DateTimeZone('UTC'));
12691268
}
12701269

12711270
return $time;

0 commit comments

Comments
 (0)