From 68f1358f546b447911156d7aebd5ef9c1b153db0 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 5 Jul 2015 22:48:09 +0200 Subject: [PATCH] rebased on master --- servatrice/src/servatrice_database_interface.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index d8ba95891..8d78e0e3c 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -775,7 +775,8 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user, const if (!checkSql()) return true; - if (!usernameIsValid(user)) + QString error; + if (!usernameIsValid(user, error)) return true; QSqlQuery *passwordQuery = prepareQuery("select password_sha512 from {prefix}_users where name = :name");