summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-11-02 07:37:06 +0000
committeralecpl <alec@alec.pl>2009-11-02 07:37:06 +0000
commit598212252c0e53a2d0c083a409ecfa72ccec4e34 (patch)
tree7606faac7aa7e85b5d1afaa7f68dcd03df133cf0
parentd3005091620ca38ced9f79d47ca75f7747f995c0 (diff)
- Fix imap_auth_type regression (#1486263)
-rw-r--r--CHANGELOG4
-rw-r--r--program/lib/imap.inc2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a6c6bff0d..4ec48fc35 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix imap_auth_type regression (#1486263)
+
+RELEASE 0.3.1
+------------------
- Specify toolbar container in compose template (#1486247)
- Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#1486243)
- Avoid unnecessary page loads for selected tab (#1486032)
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 9d896ffe0..964d12d99 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -554,7 +554,7 @@ function iil_Connect($host, $user, $password, $options=null) {
// set some imap options
if (is_array($options)) {
foreach($options as $optkey => $optval) {
- if ($optkey == 'imap') {
+ if ($optkey == 'auth_method') {
$auth_method = strtoupper($optval);
} else if ($optkey == 'rootdir') {
$my_prefs['rootdir'] = $optval;