Merge remote-tracking branch 'origin/master'

2012-04-06 09:58:42 +02:00 · 2012-04-06 09:58:42 +02:00 · 191a2caa7a
commit 191a2caa7a
parent d347471b4b 29f07f593d
1 changed files with 9 additions and 1 deletions
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@ -78,7 +78,15 @@ if (function_exists('mcrypt_encrypt')) {
    function PMA_blowfish_decrypt($encdata, $secret)
    {
        global $iv;
-        return trim(mcrypt_decrypt(MCRYPT_BLOWFISH, $secret, base64_decode($encdata), MCRYPT_MODE_CBC, $iv));
+        $data = base64_decode($encdata);
+        $decrypted = mcrypt_decrypt(
+            MCRYPT_BLOWFISH,
+            $secret,
+            $data,
+            MCRYPT_MODE_CBC,
+            $iv
+        );
+        return trim($decrypted);
    }

 } else {