Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

ChangeLog

@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #4467 shell_exec() has been disabled for security reasons
 - bug #4470 Error while submitting empty query
 - bug #4463 Fatal error: Class 'PMA_DatabaseInterface' not found
+- bug #4469 Fixed cookie based login for installations without mcrypt
 
 4.2.4.0 (2014-06-20)
 - bug #4449 Mediawiki export does not produce table header row; also fix related PHP warnings

libraries/plugins/auth/AuthenticationCookie.class.php

@@ -786,11 +786,17 @@ class AuthenticationCookie extends AuthenticationPlugin
                 mcrypt_enc_get_iv_size($td),
                 MCRYPT_DEV_URANDOM
             );
-            $GLOBALS['PMA_Config']->setCookie(
-                'pma_mcrypt_iv',
-                base64_encode($this->_blowfish_iv)
-            );
+        } else {
+            /*
+             * We don't use this value without mcrypt, but let's set it
+             * so that we don't have to check conditionally for it.
+             */
+            $this->_blowfish_iv = 'dummy';
         }
+        $GLOBALS['PMA_Config']->setCookie(
+            'pma_mcrypt_iv',
+            base64_encode($this->_blowfish_iv)
+        );
     }
 
     /**