diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-01-19 18:26:04 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-01-19 18:26:04 +0100 |
| commit | dbdb7869c47ab8c9e3a42384401a7e29599e192f (patch) | |
| tree | 2edb8f6ca9210bc0219d80084f846385da048d3a /app/FreshRSS.php | |
| parent | d105761fec48b388aa96e5089111b5c5ae941df2 (diff) | |
Safer timezone set (#5021)
* Safer timezone set
Add missing tzdata in Docker :newest
Fallback to UTC if no timezone is defined at all
#fix https://github.com/FreshRSS/FreshRSS/pull/4906#issuecomment-1386747169
* Better refactoring
Show fallback timezone everywhere
Diffstat (limited to 'app/FreshRSS.php')
| -rw-r--r-- | app/FreshRSS.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php index 02460af69..e374fa827 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -101,7 +101,10 @@ class FreshRSS extends Minz_FrontController { Minz_Translate::init($language); $timezone = isset(FreshRSS_Context::$user_conf) ? FreshRSS_Context::$user_conf->timezone : ''; - date_default_timezone_set($timezone != '' ? $timezone : '' . ini_get('date.timezone')); + if ($timezone == '') { + $timezone = FreshRSS_Context::defaultTimeZone(); + } + date_default_timezone_set($timezone); } private static function getThemeFileUrl($theme_id, $filename) { |