summaryrefslogtreecommitdiff
path: root/program/include/rcmail.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-05-17 15:35:14 +0000
committeralecpl <alec@alec.pl>2011-05-17 15:35:14 +0000
commitfcbf7a12fff1a3cd8bbace46d9b61e4ce5b6a7ce (patch)
tree72f04b464cb98aa9c27d840109bb32749620de16 /program/include/rcmail.php
parentbff88dcb94a95d53ac37d8ac3c2b86f512b5869a (diff)
- Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900), caused by commit r4554 caused by wron patch aplication
Diffstat (limited to 'program/include/rcmail.php')
-rw-r--r--program/include/rcmail.php6
1 files changed, 3 insertions, 3 deletions
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;
}