# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1533137392 -7200
# Node ID 74559e12a59f4ac9a3a996871755e25150617f39
# Parent  4bee4ba6dc5829a9d91ce93f3fe65af18a54916a
sql.Result.RowsAffected is a driver specific feature. Check
for it after handling errors.

diff -r 4bee4ba6dc58 -r 74559e12a59f controllers/pwreset.go
--- a/controllers/pwreset.go	Wed Aug 01 16:57:40 2018 +0200
+++ b/controllers/pwreset.go	Wed Aug 01 17:29:52 2018 +0200
@@ -361,7 +361,7 @@
 
 	passwordResetRequests.delete(hash)
 
-	if n, err2 := res.RowsAffected(); err2 != nil && n == 0 {
+	if n, err2 := res.RowsAffected(); err2 == nil && n == 0 {
 		err = JSONError{
 			Code:    http.StatusNotFound,
 			Message: "User not found",
diff -r 4bee4ba6dc58 -r 74559e12a59f controllers/user.go
--- a/controllers/user.go	Wed Aug 01 16:57:40 2018 +0200
+++ b/controllers/user.go	Wed Aug 01 17:29:52 2018 +0200
@@ -111,16 +111,17 @@
 		)
 	}
 
-	if n, _ := res.RowsAffected(); n == 0 {
+	if err != nil {
+		return
+	}
+
+	if n, err2 := res.RowsAffected(); err2 == nil && n == 0 {
 		err = JSONError{
 			Code:    http.StatusNotFound,
 			Message: fmt.Sprintf("Cannot find user %s.", user),
 		}
 		return
 	}
-	if err != nil {
-		return
-	}
 
 	if user != newUser.User {
 		// Running in a go routine should not be necessary.