[go: nahoru, domu]

Skip to content

Commit

Permalink
Do not set password to null when not specified
Browse files Browse the repository at this point in the history
This makes the authentication code think this parameter was not set at
all.

Fixes #118

Signed-off-by: Michal Čihař <michal@cihar.com>
  • Loading branch information
nijel committed Apr 11, 2017
1 parent 447c731 commit 1204bcd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion etc/phpmyadmin/config.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if (isset($_ENV['PMA_USER'])) {
$cfg['Servers'][$i]['auth_type'] = 'config';
$cfg['Servers'][$i]['user'] = $_ENV['PMA_USER'];
$cfg['Servers'][$i]['password'] = isset($_ENV['PMA_PASSWORD']) ? $_ENV['PMA_PASSWORD'] : null;
$cfg['Servers'][$i]['password'] = isset($_ENV['PMA_PASSWORD']) ? $_ENV['PMA_PASSWORD'] : '';
} else {
$cfg['Servers'][$i]['auth_type'] = 'cookie';
}
Expand Down

0 comments on commit 1204bcd

Please sign in to comment.