aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-10-19 04:59:47 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-10-19 04:59:47 +0100
commit98ca9a77491196ef501093572867236712d74938 (patch)
tree264cac69fb40633bbba12765e05d7b4735d6b887 /src/server
parent79f5772d7af0809294b20d6ead8705ee3a5584cf (diff)
parent9e12b969c37e46db0929b488753b7ef1433c9c42 (diff)
Merge remote-tracking branch 'origin/4.3.4' into 6.x
Diffstat (limited to 'src/server')
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp2
-rw-r--r--src/server/shared/Database/Implementation/LoginDatabase.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index c34e32b134f..42040df8ed0 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -1927,7 +1927,7 @@ public:
return false;
std::string accountName = nameStr;
- if (!AccountMgr::normalizeString(accountName))
+ if (!Utf8ToUpperOnlyLatin(accountName))
{
handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
handler->SetSentErrorMessage(true);
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.h b/src/server/shared/Database/Implementation/LoginDatabase.h
index bfbbc9023e2..78d5c55559f 100644
--- a/src/server/shared/Database/Implementation/LoginDatabase.h
+++ b/src/server/shared/Database/Implementation/LoginDatabase.h
@@ -129,7 +129,7 @@ enum LoginDatabaseStatements
LOGIN_DEL_RBAC_ACCOUNT_PERMISSION,
LOGIN_INS_ACCOUNT_MUTE,
- LOGIN_SEL_ACCOUNT_MUTE_INFO
+ LOGIN_SEL_ACCOUNT_MUTE_INFO,
LOGIN_SEL_BNET_ACCOUNT_INFO,
LOGIN_DEL_BNET_EXPIRED_BANS,