gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2012-11-26 23:57:05 +01:00
commit 785933e4ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/plugins/auth/AuthenticationHttp.class.php
View File

@ -103,7 +103,6 @@ class AuthenticationHttp extends AuthenticationPlugin
public function authCheck()
{
global $PHP_AUTH_USER, $PHP_AUTH_PW;
global $old_usr;
// Grabs the $PHP_AUTH_USER variable whatever are the values of the
// 'register_globals' and the 'variables_order' directives
@ -159,7 +158,8 @@ class AuthenticationHttp extends AuthenticationPlugin
}
// User logged out -> ensure the new username is not the same
if (!empty($old_usr)
$old_usr = $_REQUEST['old_usr'];
if (! empty($old_usr)
&& (isset($PHP_AUTH_USER) && $old_usr == $PHP_AUTH_USER)
) {
$PHP_AUTH_USER = '';
@ -245,4 +245,4 @@ class AuthenticationHttp extends AuthenticationPlugin
public function update (SplSubject $subject)
{
}
}
}