From a79be1b112207c6d8d9c47c670dd8bb59b75f9fe Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 7 Dec 2017 14:42:53 +0100
Subject: [PATCH] fix timezone selection, closes
 https://github.com/opnsense/core/issues/1973

---
 src/www/system_general.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/www/system_general.php b/src/www/system_general.php
index ab146b287..8a2120cc6 100644
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -47,8 +47,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['language'] = $config['system']['language'];
     $pconfig['prefer_ipv4'] = isset($config['system']['prefer_ipv4']);
     $pconfig['theme'] = $config['theme'];
-    $pconfig['timezone'] = $config['system']['timezone'];
-    $pconfig['timezone'] = 'Etc/UTC';
+    $pconfig['timezone'] = empty($pconfig['timezone']) ? 'Etc/UTC' : $config['system']['timezone'] ;
 
     for ($dnscounter = 1; $dnscounter < 9; $dnscounter++) {
         $dnsname = "dns{$dnscounter}";