diff --git a/app/modules/UtilsModule.php b/app/modules/UtilsModule.php index 93f206d..962b844 100644 --- a/app/modules/UtilsModule.php +++ b/app/modules/UtilsModule.php @@ -600,8 +600,8 @@ class UtilsModule { $timestamp = time(); } - $date = new DateTime("@$timestamp", new DateTimeZone(app('timezone', date_default_timezone_get()))); - $date->setTimezone(new DateTimeZone('UTC')); + $date = new DateTime("@$timestamp", new DateTimeZone('UTC')); + $date->setTimezone(new DateTimeZone(app('timezone', date_default_timezone_get()))); return $date->format($format); } diff --git a/app/modules/WeatherModule.php b/app/modules/WeatherModule.php index 2fb8f45..59bd85a 100644 --- a/app/modules/WeatherModule.php +++ b/app/modules/WeatherModule.php @@ -71,7 +71,7 @@ class WeatherModule { $fillcheck = (daylight_saving_time()) ? '02:00' : '01:00'; $time = convert_date('H:00', $forecast->list[0]->dt); - if ($time !== '02:00') { + if ($time !== $fillcheck) { $forecast->is_filled = true; } @@ -98,11 +98,9 @@ class WeatherModule { } } - if (daylight_saving_time()) { - if ($forecast->is_filled) { - for ($i = count($fills) - 1; $i >= 0; $i--) { - array_unshift($forecast->list, $fills[$i]); - } + if ($forecast->is_filled) { + for ($i = count($fills) - 1; $i >= 0; $i--) { + array_unshift($forecast->list, $fills[$i]); } }