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

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-11-07 08:09:51 +11:00
commit 26f45609dd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/server_privileges.lib.php
View File

@ -2095,12 +2095,13 @@ function PMA_updatePassword($err_url, $username, $hostname)
. $hostname . "';";
// Update the plugin for the user
$GLOBALS['dbi']->tryQuery($update_plugin_query)
or Util::mysqlDie(
if (!($GLOBALS['dbi']->tryQuery($update_plugin_query))) {
Util::mysqlDie(
$GLOBALS['dbi']->getError(),
$update_plugin_query,
false, $err_url
);
}
$GLOBALS['dbi']->tryQuery("FLUSH PRIVILEGES;");
@ -2153,10 +2154,11 @@ function PMA_updatePassword($err_url, $username, $hostname)
. '(\'' . Util::sqlAddSlashes($_POST['pma_pw']) . '\')');
}
$GLOBALS['dbi']->tryQuery($local_query)
or Util::mysqlDie(
if (!($GLOBALS['dbi']->tryQuery($local_query))) {
Util::mysqlDie(
$GLOBALS['dbi']->getError(), $sql_query, false, $err_url
);
}
$message = Message::success(
__('The password for %s was changed successfully.')
);