From 1523985bce4aeb15950e80aa75183a473c06430f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 17 Mar 2016 11:31:06 +0100 Subject: [PATCH] Fix login after logout with http authentication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can not check token here as it's always there (in the URL) after logout. Fixes #12098 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/plugins/auth/AuthenticationHttp.php | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index afdcb1afd1..85a83c7919 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog - issue #12092 Rename exported databases/tables doesn't seem to work - issue #12099 Undefined index: controllink - 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. diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/plugins/auth/AuthenticationHttp.php index 8123bdc49f..6c668d2526 100644 --- a/libraries/plugins/auth/AuthenticationHttp.php +++ b/libraries/plugins/auth/AuthenticationHttp.php @@ -126,10 +126,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 whatever are the values of the // 'register_globals' and the 'variables_order' directives if (empty($PHP_AUTH_USER)) {