From 05e584f5a645f5083c12ccaf62dcef79a2a3886f Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 2 Nov 2009 07:37:06 +0000
Subject: - Fix imap_auth_type regression (#1486263)

git-svn-id: https://svn.roundcube.net/trunk@3084 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/CHANGELOG            | 4 ++++
 roundcubemail/program/lib/imap.inc | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index a6c6bff0d..4ec48fc35 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/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/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc
index 9d896ffe0..964d12d99 100644
--- a/roundcubemail/program/lib/imap.inc
+++ b/roundcubemail/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;
-- 
cgit v1.2.3