Imported Upstream version 0.5.3+dfsg

[roundcube.git] / program / include / rcmail.php.orig

diff --git a/program/include/rcmail.php.orig b/program/include/rcmail.php.orig
index 9613dba5ff246c40f2cec70c7af64117d6a3a75b..9ebfc6727f64a31b23981b4416ca80f521f74856 100644 (file)
--- a/program/include/rcmail.php.orig
+++ b/program/include/rcmail.php.orig
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: rcmail.php 4626 2011-03-31 12:32:44Z alec $
+ $Id: rcmail.php 4779 2011-05-17 15:35:14Z alec $
 
 */
 
@@ -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;
   }