summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-11-26 14:31:50 +0000
committeralecpl <alec@alec.pl>2011-11-26 14:31:50 +0000
commit0829b76598425f0319014fe5a3bbc08333a59961 (patch)
tree0755e57cee94e6dd201615c97fab904b70f6ba49 /program
parent3e5c709fa719e2458df06e515fa4893ae743edda (diff)
- Fix merging some configuration options in update.sh script (#1485864)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_config.php7
1 files changed, 5 insertions, 2 deletions
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