diff options
| author | Michal Čihař <michal@cihar.com> | 2016-01-17 20:44:09 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-01-17 20:44:09 +0300 |
| commit | f141cb1463a77d1258abb2e399af99dd37d89da5 (patch) | |
| tree | 7d7fd7e1dddcf965263ac5141e55ba2ba1943b7d /user_password.php | |
| parent | b231ed9dc7f05ac3523754e4479c654371d302a7 (diff) | |
| parent | bfaa77ef21ab04b63d165f78d84f6b8bb716c8d8 (diff) | |
Merge branch 'QA_4_5'
Diffstat (limited to 'user_password.php')
| -rw-r--r-- | user_password.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/user_password.php b/user_password.php index df8cd8b3eb..78e86617fa 100644 --- a/user_password.php +++ b/user_password.php @@ -210,7 +210,7 @@ function PMA_changePassHashingFunction() } /** - * Generate the error url and submit the query + * Changes password for a user * * @param string $username Username * @param string $hostname Hostname @@ -236,6 +236,7 @@ function PMA_changePassUrlParamsAndSubmitQuery( : '\'' . PMA\libraries\Util::sqlAddSlashes($password) . '\''); } else if ($serverType == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 50200 + && PMA_MYSQL_INT_VERSION < 100100 ) { if ($orig_auth_plugin == 'mysql_native_password') { // Set the hashing method used by PASSWORD() |