Merge from master

This commit is contained in:
akkadius
2014-09-17 20:16:37 -05:00
31 changed files with 2373 additions and 2861 deletions
+1 -1
View File
@@ -272,7 +272,7 @@ bool Database::DeleteAccount(const char* name) {
}
bool Database::SetLocalPassword(uint32 accid, const char* password) {
std::string query = StringFormat("UPDATE `account` SET `password` = MD5('%s') where id=%i;", password, accid);
std::string query = StringFormat("UPDATE account SET password=MD5('%s') where id=%i;", EscapeString(password).c_str(), accid);
auto results = QueryDatabase(query);