Merge branch 'imp_7_0'

horde · Jul 16, 2014 · 667c3a1 · 667c3a1
2 parents a589795 + 70205ac
commit 667c3a1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/imp/lib/Crypt/Pgp.php b/imp/lib/Crypt/Pgp.php
@@ -89,7 +89,7 @@ public function generatePersonalKeys($name, $email, $passphrase,
      */
     public function addPersonalPublicKey($public_key)
     {
-        $GLOBALS['prefs']->setValue('pgp_public_key', trim(is_array($public_key) ? implode('', $public_key) : $public_key));
+        $GLOBALS['prefs']->setValue('pgp_public_key', trim($public_key));
     }
 
     /**
@@ -100,7 +100,7 @@ public function addPersonalPublicKey($public_key)
      */
     public function addPersonalPrivateKey($private_key)
     {
-        $GLOBALS['prefs']->setValue('pgp_private_key', trim(is_array($private_key) ? implode('', $private_key) : $private_key));
+        $GLOBALS['prefs']->setValue('pgp_private_key', trim($private_key));
     }
 
     /**