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

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2017-06-02 18:04:39 +02:00
commit 2af08b93f1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
4.7.2 (not yet released)
- issue #13314 Make theme selection keep current server
- issue #13311 Fixed direct login for accounts without password
4.7.1 (2017-05-25)
- issue #13132 Always execute tracking queries as controluser

2
libraries/plugins/auth/AuthenticationCookie.php
View File

@ -344,7 +344,7 @@ class AuthenticationCookie extends AuthenticationPlugin
// The user just logged in
$GLOBALS['PHP_AUTH_USER'] = PMA_sanitizeMySQLUser($_REQUEST['pma_username']);
$GLOBALS['PHP_AUTH_PW'] = $_REQUEST['pma_password'];
$GLOBALS['PHP_AUTH_PW'] = isset($_REQUEST['pma_password']) ? $_REQUEST['pma_password'] : '';
if ($GLOBALS['cfg']['AllowArbitraryServer']
&& isset($_REQUEST['pma_servername'])
) {