Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -67,7 +67,8 @@ phpMyAdmin - ChangeLog
 - issue #12085 Like search strings being escaped incorrectly
 - issue #12092 Rename exported databases/tables doesn't seem to work
 - issue #12099 Undefined index: controllink
-- issue #12092 PHP Fatal error: Call to undefined function __()
+- issue #12094 PHP Fatal error: Call to undefined function __()
+- issue #12098 Fix login after logout with http authentication
 
 4.5.5.1 (2016-02-29)
 - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.

libraries/plugins/auth/AuthenticationHttp.php

@@ -124,10 +124,6 @@ class AuthenticationHttp extends AuthenticationPlugin
     {
         global $PHP_AUTH_USER, $PHP_AUTH_PW;
 
-        if ($GLOBALS['token_provided'] && $GLOBALS['token_mismatch']) {
-            return false;
-        }
-
         // Grabs the $PHP_AUTH_USER variable
         if (empty($PHP_AUTH_USER)) {
             if (PMA_getenv('PHP_AUTH_USER')) {