From 51806b925b01cfeb9a39faa0e9d2bec8259a9089 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 15 Feb 2011 13:24:47 +0000
Subject: - Close IMAP connection after SMTP, per discussion in (#1485975)

git-svn-id: https://svn.roundcube.net/trunk@4547 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcmail.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/include/rcmail.php')

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 1c9810681..319e53cc0 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -1060,9 +1060,6 @@ class rcmail
    */
   public function shutdown()
   {
-    if (is_object($this->imap))
-      $this->imap->close();
-
     if (is_object($this->smtp))
       $this->smtp->disconnect();
 
@@ -1073,6 +1070,9 @@ class rcmail
         $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();
-- 
cgit v1.2.3