Only save the IMAP object once per session

diff --git a/imp/lib/Imap.php b/imp/lib/Imap.php
index 8fafb2c..bcdbdd8 100644 (file)
--- a/imp/lib/Imap.php
+++ b/imp/lib/Imap.php
@@ -62,9 +62,9 @@ class IMP_Imap
         $this->_serverkey = $serverkey;
 
         /* Rebuild the Horde_Imap_Client object. */
-        $this->_loadImapObject();
-
-        register_shutdown_function(array($this, 'shutdown'));
+        if (!$this->_loadImapObject()) {
+            register_shutdown_function(array($this, 'shutdown'));
+        }
     }
 
     /**