X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Finclude%2Frcmail.php;h=47144b64fc0f51681820972170ceb8da047b225d;hb=81942a239bba3e46191211a3231ecfadd91ac038;hp=4aa95a0ded775d39a0aae422165e700fbddc8e9d;hpb=07e1de2dcd3f3ff8910a3680493f035b3c693cf0;p=roundcube.git

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 4aa95a0..47144b6 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -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;
   }