summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcmail.php6
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d31404bfb..972c94caf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900)
- Fix some CSS issues in Settings for Internet Explorer
- Fixed handling of folder with name "0" in folder selector
- Fix bug where messages were deleted instead moved to trash folder after Shift key was used (#1487902)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 8b4383e10..7ef34724e 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1078,6 +1078,9 @@ class rcmail
if (is_object($book))
$book->close();
+ if (is_object($this->imap))
+ $this->imap->close();
+
// before closing the database connection, write session data
if ($_SERVER['REMOTE_ADDR'])
session_write_close();
@@ -1193,9 +1196,6 @@ class rcmail
}
}
- if (is_object($this->imap))
- $this->imap->close();
-
return $base64 ? base64_encode($cipher) : $cipher;
}