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 2014-07-17 14:42:53 +02:00
commit 5602f38be5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
user_password.php
View File

@ -21,8 +21,8 @@ $scripts->addFile('server_privileges.js');
* Displays an error message and exits if the user isn't allowed to use this
* script
*/
if (! $cfg['ShowChgPassword']) {
$cfg['ShowChgPassword'] = $GLOBALS['dbi']->selectDb('mysql');
if (! $GLOBALS['cfg']['ShowChgPassword']) {
$GLOBALS['cfg']['ShowChgPassword'] = $GLOBALS['dbi']->selectDb('mysql');
}
if ($cfg['Server']['auth_type'] == 'config' || ! $cfg['ShowChgPassword']) {
PMA_Message::error(