From 50a64ccd1e4ab29a751cf222e4564c3b2cd5153f Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 3 Aug 2017 00:13:21 +0200 Subject: Core/Misc: Revert back to using boost::regex, std::wregex doesn't work for name validation Closes #20094 (cherry picked from commit 6691e41873f255c0f303229b0bd2e5db77a3c879) --- src/server/game/DataStores/DB2Stores.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index cf258e0b3fa..1d74072f3a0 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -1093,7 +1093,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul std::wstring name; ASSERT(Utf8toWStr(namesProfanity->Name, name)); if (namesProfanity->Language != -1) - _nameValidators[namesProfanity->Language].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize); + _nameValidators[namesProfanity->Language].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); else { for (uint32 i = 0; i < TOTAL_LOCALES; ++i) @@ -1101,7 +1101,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul if (i == LOCALE_none) continue; - _nameValidators[i].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize); + _nameValidators[i].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); } } } @@ -1110,7 +1110,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul { std::wstring name; ASSERT(Utf8toWStr(namesReserved->Name, name)); - _nameValidators[TOTAL_LOCALES].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize); + _nameValidators[TOTAL_LOCALES].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); } for (NamesReservedLocaleEntry const* namesReserved : sNamesReservedLocaleStore) @@ -1124,7 +1124,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul continue; if (namesReserved->LocaleMask & (1 << i)) - _nameValidators[i].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize); + _nameValidators[i].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); } } -- cgit v1.2.3