summaryrefslogtreecommitdiff
path: root/program/include/rcube_config.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-11-28 09:03:27 +0000
committeralecpl <alec@alec.pl>2011-11-28 09:03:27 +0000
commit77449d011b2367a9f3d7bb179534aa09865aa26e (patch)
tree20a299715c627cecdc2f7247056dde120748c6a7 /program/include/rcube_config.php
parent2a3e02769d2014038675a5d8ddf18d1dba87bf2f (diff)
- Applied fixes from trunk up to r5498
Diffstat (limited to 'program/include/rcube_config.php')
-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