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

Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

Browse Source
This commit is contained in:
Weblate 2015-12-19 18:30:58 +01:00
commit ed08510b98
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
user_password.php
View File

@ -156,6 +156,9 @@ function PMA_changePassword($password, $message, $change_password_message)
);
}
$sql_query = 'SET password = '
. (($password == '') ? '\'\'' : $hashing_function . '(\'***\')');
if ($serverType == 'MySQL'
&& PMA_MYSQL_INT_VERSION >= 50706
) {
@ -178,8 +181,7 @@ function PMA_changePassword($password, $message, $change_password_message)
}
$GLOBALS['dbi']->tryQuery('SET `old_passwords` = ' . $value . ';');
}
$sql_query = 'SET password = '
. (($password == '') ? '\'\'' : $hashing_function . '(\'***\')');
PMA_changePassUrlParamsAndSubmitQuery(
$username, $hostname, $password,
$sql_query, $hashing_function, $orig_auth_plugin