From 0829b76598425f0319014fe5a3bbc08333a59961 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 26 Nov 2011 14:31:50 +0000
Subject: - Fix merging some configuration options in update.sh script
 (#1485864)

---
 program/include/rcube_config.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'program/include')

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 01e678150..f80f92c91 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -90,11 +90,14 @@ class rcube_config
 
         // enable display_errors in 'show' level, but not for ajax requests
         ini_set('display_errors', intval(empty($_REQUEST['_remote']) && ($this->prop['debug_level'] & 4)));
-        
+
         // set timezone auto settings values
         if ($this->prop['timezone'] == 'auto') {
           $this->prop['dst_active'] = intval(date('I'));
-          $this->prop['_timezone_value']   = date('Z') / 3600 - $this->prop['dst_active'];
+          $this->prop['_timezone_value'] = date('Z') / 3600 - $this->prop['dst_active'];
+        }
+        else if ($this->prop['dst_active'] === null) {
+          $this->prop['dst_active'] = intval(date('I'));
         }
 
         // export config data
-- 
cgit v1.2.3