From c041d57036d4a30730408c8fbba2d4e12778d2d5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 19 Oct 2011 05:56:06 -0400
Subject: [PATCH] - Added 'search_dn_default' variable in ldap config - Better handling of situation when search for bind DN doesn't return data
---
program/include/rcube_config.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 1c8e237..01e6781 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -220,8 +220,10 @@
// override timezone settings with client values
if ($this->prop['timezone'] == 'auto') {
$this->prop['_timezone_value'] = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : $this->prop['_timezone_value'];
- $this->prop['dst_active'] = isset($_SESSION['dst_active']) ? $_SESSION['dst_active'] : $this->prop['dst_active'];
+ $this->prop['dst_active'] = $this->userprefs['dst_active'] = isset($_SESSION['dst_active']) ? $_SESSION['dst_active'] : $this->prop['dst_active'];
}
+ else if (isset($this->prop['_timezone_value']))
+ unset($this->prop['_timezone_value']);
}
--
Gitblit v1.9.1