From c2846af4c8fced17d1090bf9a0334b0c328b9b30 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 27 Oct 2015 07:34:13 +1100 Subject: [PATCH] Fix #11606 PMA_Util not found when changing password Signed-off-by: Madhura Jayaratne --- libraries/server_privileges.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 10c2b00e56..c690cef6fe 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2096,7 +2096,7 @@ function PMA_updatePassword($err_url, $username, $hostname) // Update the plugin for the user $GLOBALS['dbi']->tryQuery($update_plugin_query) - or PMA_Util::mysqlDie( + or Util::mysqlDie( $GLOBALS['dbi']->getError(), $update_plugin_query, false, $err_url @@ -2120,18 +2120,18 @@ function PMA_updatePassword($err_url, $username, $hostname) } $sql_query = 'SET PASSWORD FOR \'' - . PMA_Util::sqlAddSlashes($username) - . '\'@\'' . PMA_Util::sqlAddSlashes($hostname) . '\' = ' + . Util::sqlAddSlashes($username) + . '\'@\'' . Util::sqlAddSlashes($hostname) . '\' = ' . (($_POST['pma_pw'] == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $_POST['pma_pw']) . '\')'); $local_query = 'SET PASSWORD FOR \'' - . PMA_Util::sqlAddSlashes($username) - . '\'@\'' . PMA_Util::sqlAddSlashes($hostname) . '\' = ' + . Util::sqlAddSlashes($username) + . '\'@\'' . Util::sqlAddSlashes($hostname) . '\' = ' . (($_POST['pma_pw'] == '') ? '\'\'' : $hashing_function - . '(\'' . PMA_Util::sqlAddSlashes($_POST['pma_pw']) . '\')'); + . '(\'' . Util::sqlAddSlashes($_POST['pma_pw']) . '\')'); } else { if (isset($_REQUEST['authentication_plugin']) && $_REQUEST['authentication_plugin'] == 'mysql_native_password'