From 196e6ffe7d02bec868ed193c77d8eddc95bb5baf Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 25 Feb 2009 22:07:00 -0700 Subject: [PATCH] Fix some code relating to verifying PGP message --- imp/lib/Crypt/pgp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imp/lib/Crypt/pgp.php b/imp/lib/Crypt/pgp.php index 54214b8b4..3633b3120 100644 --- a/imp/lib/Crypt/pgp.php +++ b/imp/lib/Crypt/pgp.php @@ -192,7 +192,7 @@ class IMP_Horde_Crypt_pgp extends Horde_Crypt_pgp /* Try retrieving via a PGP public keyserver. */ if ($server && is_a($result, 'PEAR_Error')) { - $this->getFromPublicKeyserver($fingerprint, $address); + $result = $this->getFromPublicKeyserver($fingerprint, $address); } /* Return now, if no public key found at all. */ @@ -303,10 +303,10 @@ class IMP_Horde_Crypt_pgp extends Horde_Crypt_pgp foreach ($conf['utils']['gnupg_keyserver'] as $server) { $result = $this->getPublicKeyserver($data, $server, $timeout, $additional); if (!is_a($result, 'PEAR_Error')) { - throw new Horde_Exception($result); + return $result; } } - return $result; + throw new Horde_Exception(_("Could not connect to public PGP keyserver")); } else { return $this->putPublicKeyserver($data, $conf['utils']['gnupg_keyserver'][0], $timeout); } -- 2.11.0