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

Merge branch 'QA_4_5'

Browse Source
This commit is contained in:
Marc Delisle 2015-10-28 08:44:19 -04:00
commit 0e57191f0a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/server_privileges.lib.php
View File

@ -3995,10 +3995,18 @@ function PMA_getDataForChangeOrCopyUser()
if (Util::getServerType() == 'MySQL'
&& PMA_MYSQL_INT_VERSION >= 50606
&& PMA_MYSQL_INT_VERSION < 50706
&& isset($password)
&& ((isset($authentication_string)
&& empty($password))
|| (isset($plugin)
&& $plugin == 'sha256_password'))
) {
$password = $authentication_string;
}
if (PMA_Util::getServerType() == 'MariaDB'
&& PMA_MYSQL_INT_VERSION >= 50500
&& isset($authentication_string)
&& empty($password)
&& isset($plugin)
&& $plugin == 'sha256_password'
) {
$password = $authentication_string;
}