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

Merge commit '1e6f128'

Browse Source
This commit is contained in:
Marc Delisle 2015-10-27 12:57:10 -04:00
commit c0b387acf2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/server_privileges.lib.php
View File

@ -5142,7 +5142,7 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
$create_user_real = $create_user_show = $create_user_stmt;
$password_set_stmt = 'SET PASSWORD FOR \'%s\'@\'%s\' = PASSWORD(\'%s\')';
$password_set_stmt = 'SET PASSWORD FOR \'%s\'@\'%s\' = \'%s\'';
$password_set_show = sprintf(
$password_set_stmt,
$slashedUsername,
@ -5188,11 +5188,12 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
null
);
} else {
$hashedPassword = PMA_getHashedPassword($_POST['pma_pw']);
$password_set_real = sprintf(
$password_set_stmt,
$slashedUsername,
$slashedHostname,
$_POST['pma_pw']
$hashedPassword
);
}
} else {
@ -5213,10 +5214,9 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
$create_user_real = $create_user_show = $create_user_stmt;
if ($_POST['pred_password'] == 'keep') {
$hashedPassword = PMA_getHashedPassword($password);
$create_user_real = sprintf(
$create_user_stmt,
$hashedPassword
$slashedPassword
);
$create_user_show = sprintf(
$create_user_stmt,