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/etc/inc/config.gui.inc | |
| 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/etc/inc/config.gui.inc')
| -rw-r--r-- | src/etc/inc/config.gui.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/etc/inc/config.gui.inc b/src/etc/inc/config.gui.inc index 56b5555..175a811 100644 --- a/src/etc/inc/config.gui.inc +++ b/src/etc/inc/config.gui.inc @@ -80,8 +80,12 @@ if (file_exists("/debugging")) { $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"); |
