Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeven Bansod <devenbansod.bits@gmail.com>2016-07-25 22:35:17 +0300
committerDeven Bansod <devenbansod.bits@gmail.com>2016-07-25 22:35:17 +0300
commit68903ae7a78dfa93f6feedbf62fde419d5d54b37 (patch)
tree136f6e56e28a37b57e8c4abd77930fd2310eb6d2 /user_password.php
parente3e51db544326be5aaa669839dc1ca5962107ebb (diff)
parent25182fb6c349a95de3a7b2e2453d3fe22913d439 (diff)
Merge branch 'QA_4_6'
Diffstat (limited to 'user_password.php')
-rw-r--r--user_password.php5
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;");
}
/**