Changeset 4779 in subversion

Timestamp:

May 17, 2011 11:35:14 AM (2 years ago)

Author:

alec

Message:

• Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900), caused by commit r4554 caused by wron patch aplication

Location:

branches/release-0.5

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcmail.php (modified) (2 diffs)

branches/release-0.5/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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

branches/release-0.5/program/include/rcmail.php

@@ -1079 +1079 @@
         $book->close();
 
+    if (is_object($this->imap))
+      $this->imap->close();
+
     // before closing the database connection, write session data
     if ($_SERVER['REMOTE_ADDR'])
@@ -1194 +1197 @@
     }
 
-    if (is_object($this->imap))
-      $this->imap->close();
-
     return $base64 ? base64_encode($cipher) : $cipher;
   }