diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-09 11:48:41 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-09 11:48:41 -0200 |
| commit | ecaca7529d26970e1cc09a2e8c1b783c70fab23a (patch) | |
| tree | 5267b3125b014335b05d0d71e189e557588f7a91 /src/usr/local/www/system.php | |
| parent | f8ae35862e05b1d5b43678144071a6e03ab8c3c5 (diff) | |
| download | pfsense-ecaca7529d26970e1cc09a2e8c1b783c70fab23a.zip pfsense-ecaca7529d26970e1cc09a2e8c1b783c70fab23a.tar.gz | |
Try to use default timezone from globals.inc when possible. Stop setting timezone on pkg_mgr_installed.php
Diffstat (limited to 'src/usr/local/www/system.php')
| -rw-r--r-- | src/usr/local/www/system.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 31371ba..dd10ba5 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -96,8 +96,13 @@ if (!isset($pconfig['timeupdateinterval'])) { $pconfig['timeupdateinterval'] = 300; } if (!$pconfig['timezone']) { - $pconfig['timezone'] = "Etc/UTC"; + if (isset($g['default_timezone']) && !empty($g['default_timezone'])) { + $pconfig['timezone'] = $g['default_timezone']; + } else { + $pconfig['timezone'] = "Etc/UTC"; + } } + if (!$pconfig['timeservers']) { $pconfig['timeservers'] = "pool.ntp.org"; } |
