From dc640711851b39dd8090826cfe0108578e02f09e Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Sat, 19 Dec 2015 22:00:39 +0530 Subject: [PATCH] Add a base case for MySQL versions 5.5.0 - 5.5.7 Signed-off-by: Deven Bansod --- user_password.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_password.php b/user_password.php index d172f9f691b9..df8cd8b3eb45 100644 --- a/user_password.php +++ b/user_password.php @@ -156,6 +156,9 @@ function PMA_changePassword($password, $message, $change_password_message) ); } + $sql_query = 'SET password = ' + . (($password == '') ? '\'\'' : $hashing_function . '(\'***\')'); + if ($serverType == 'MySQL' && PMA_MYSQL_INT_VERSION >= 50706 ) { @@ -177,9 +180,6 @@ function PMA_changePassword($password, $message, $change_password_message) $value = 0; } $GLOBALS['dbi']->tryQuery('SET `old_passwords` = ' . $value . ';'); - - $sql_query = 'SET password = ' - . (($password == '') ? '\'\'' : $hashing_function . '(\'***\')'); } PMA_changePassUrlParamsAndSubmitQuery(