diff options
Diffstat (limited to 'src/etc/inc/config.inc')
| -rw-r--r-- | src/etc/inc/config.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc index 4792ac3..10d9137 100644 --- a/src/etc/inc/config.inc +++ b/src/etc/inc/config.inc @@ -210,8 +210,12 @@ if (platform_booting(true)) { $config = parse_config(); /* set timezone */ -$timezone = $config['system']['timezone']; -if (!$timezone) { +if (isset($config['system']['timezone']) && + !empty($config['system']['timezone'])) { + $timezone = $config['system']['timezone']; +} elseif (isset($g['default_timezone']) && !empty($g['default_timezone'])) { + $timezone = $g['default_timezone']; +} else { $timezone = "Etc/UTC"; } date_default_timezone_set("$timezone"); |
