Fix setting password if no encryption key exists

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
index 7a10b7f..bd1af07 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -145,11 +145,14 @@ abstract class Horde_Imap_Client_Base implements Serializable
         $this->_params = $params;
 
         // Encrypt password.
-        if (!is_null($this->_params['encryptKey'])) {
-            $secret = new Horde_Secret();
-            $this->_params['password'] = $secret->write($this->_getEncryptKey(), $this->_params['password']);
-            $this->_params['_passencrypt'] = true;
-        }
+        try {
+            $encrypt_key = $this->_getEncryptKey();
+            if (strlen($encrypt_key)) {
+                $secret = new Horde_Secret();
+                $this->_params['password'] = $secret->write($encrypt_key, $this->_params['password']);
+                $this->_params['_passencrypt'] = true;
+            }
+        } catch (Horde_Imap_Client_Exception $e) {}
 
         $this->_init();
     }