diff options
| author | Michal Čihař <michal@cihar.com> | 2016-07-26 17:31:21 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-07-26 17:31:21 +0300 |
| commit | f5015c2ea30841f1541cb99e58630baab95925b6 (patch) | |
| tree | 129b5a4d2ec2b583354a7b2064451fc766379215 /user_password.php | |
| parent | 9ff612a76c83f89e9e6588154fd6849e6b8e9d42 (diff) | |
| parent | 99492bf42aee13181ec6b796c5d13db3ee915b94 (diff) | |
Merge branch 'QA_4_6-security' into master-security
Diffstat (limited to 'user_password.php')
| -rw-r--r-- | user_password.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/user_password.php b/user_password.php index e9764e86f5..8f442ab0b5 100644 --- a/user_password.php +++ b/user_password.php @@ -255,8 +255,6 @@ function PMA_changePassUrlParamsAndSubmitQuery( . " `plugin` = '" . $orig_auth_plugin . "'" . " WHERE `User` = '" . $username . "' AND Host = '" . $hostname . "';"; - - $GLOBALS['dbi']->tryQuery("FLUSH PRIVILEGES;"); } else { $local_query = 'SET password = ' . (($password == '') ? '\'\'' @@ -271,6 +269,9 @@ function PMA_changePassUrlParamsAndSubmitQuery( $err_url ); } + + // Flush privileges after successful password change + $GLOBALS['dbi']->tryQuery("FLUSH PRIVILEGES;"); } /** |