- Fix merging some configuration options in update.sh script (#1485864)

alecpl

2011-11-26 0829b76598425f0319014fe5a3bbc08333a59961

 program/include/rcube_config.php

@@ -95,6 +95,9 @@
        if ($this->prop['timezone'] == 'auto') {
          $this->prop['dst_active'] = intval(date('I'));
          $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