From df10bd5f2c98831bc20fae9c579967109345fdab Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 14 May 2015 07:19:28 -0400
Subject: [PATCH] Fix bug where imap_conn_options were ignored in IMAP connection test (#1490392)
---
CHANGELOG | 1 +
installer/test.php | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index e1edae5..e6775b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@
- Fix bug where messages count was not updated after message move/delete with skip_deleted=false (#1490372)
- Fix security issue in contact photo handling (#1490379)
- Fix possible memcache/apc cache data consistency issues (#1490390)
+- Fix bug where imap_conn_options were ignored in IMAP connection test (#1490392)
RELEASE 1.1.1
-------------
diff --git a/installer/test.php b/installer/test.php
index 988451e..72be968 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -427,6 +427,7 @@
$imap->set_options(array(
'auth_type' => $RCI->getprop('imap_auth_type'),
'debug' => $RCI->getprop('imap_debug'),
+ 'socket_options' => $RCI->getprop('imap_conn_options'),
));
if ($imap->connect($imap_host, $imap_user, $_POST['_pass'], $imap_port, $imap_ssl)) {
--
Gitblit v1.9.1