From e3492e8e6fe5600f52c8af0f7ca35a9cc7c1e498 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Fri, 19 Feb 2010 14:10:14 +0000
Subject: [PATCH] Change password only if changed

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1321 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/user.inc.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index 6cad287b..d534ccda 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -50,10 +50,10 @@ if ($_POST && !$error) {
 	if ($_POST["drop"]) {
 		query_redirect("DROP USER $old_user", ME . "privileges=", lang('User has been dropped.'));
 	} else {
-		if ($old_user == $new_user) {
-			queries("SET PASSWORD FOR $new_user = " . ($_POST["hashed"] ? $pass : "PASSWORD($pass)"));
-		} else {
+		if ($old_user != $new_user) {
 			$error = !queries(($connection->server_info < 5 ? "GRANT USAGE ON *.* TO" : "CREATE USER") . " $new_user IDENTIFIED BY" . ($_POST["hashed"] ? " PASSWORD" : "") . " $pass");
+		} elseif ($_POST["pass"] != $old_pass || !$_POST["hashed"]) {
+			queries("SET PASSWORD FOR $new_user = " . ($_POST["hashed"] ? $pass : "PASSWORD($pass)"));
 		}
 		if (!$error) {
 			$revoke = array();
@@ -107,9 +107,7 @@ if ($_POST) {
 } else {
 	$row = $_GET + array("host" => $connection->result($connection->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', -1)"))); // create user on the same domain by default
 	$row["pass"] = $old_pass;
-	if ($old_pass != "") {
-		$row["hashed"] = true;
-	}
+	$row["hashed"] = true;
 	$grants[""] = true;
 }