diff options
| author | Ovahlord <dreadkiller@gmx.de> | 2021-03-11 11:44:27 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2021-05-15 13:37:02 +0200 |
| commit | edcaac6c959e944dc6d6dc224666b832521412b4 (patch) | |
| tree | db995b1f369d81e149f0d506350867fab827c0d9 | |
| parent | f418631de0c193772e24f379db5aafcc01f3fb6a (diff) | |
Core/DBLayer: escape MySQL keywords in page_text, page_text_locale, broadcast_text and broadcast_text_locale select queries
(cherry picked from commit d4f71131f032ecc68545acd838de5a3ccfadc331)
# Conflicts:
# src/server/game/Globals/ObjectMgr.cpp
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d68a07234f3..b74d7fb3ead 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5953,8 +5953,8 @@ void ObjectMgr::LoadPageTexts() { uint32 oldMSTime = getMSTime(); - // 0 1 2 - QueryResult result = WorldDatabase.Query("SELECT ID, Text, NextPageID FROM page_text"); + // 0 1 2 + QueryResult result = WorldDatabase.Query("SELECT ID, `Text`, NextPageID FROM page_text"); if (!result) { @@ -6005,8 +6005,8 @@ void ObjectMgr::LoadPageTextLocales() _pageTextLocaleStore.clear(); // need for reload case - // 0 1 2 - QueryResult result = WorldDatabase.Query("SELECT ID, locale, Text FROM page_text_locale"); + // 0 1 2 + QueryResult result = WorldDatabase.Query("SELECT ID, locale, `Text` FROM page_text_locale"); if (!result) return; @@ -9755,8 +9755,8 @@ void ObjectMgr::LoadBroadcastTexts() _broadcastTextStore.clear(); // for reload case - // 0 1 2 3 4 5 6 7 8 9 10 11 12 - QueryResult result = WorldDatabase.Query("SELECT ID, LanguageID, Text, Text1, EmoteID1, EmoteID2, EmoteID3, EmoteDelay1, EmoteDelay2, EmoteDelay3, SoundEntriesID, EmotesID, Flags FROM broadcast_text"); + // 0 1 2 3 4 5 6 7 8 9 10 11 12 + QueryResult result = WorldDatabase.Query("SELECT ID, LanguageID, `Text`, Text1, EmoteID1, EmoteID2, EmoteID3, EmoteDelay1, EmoteDelay2, EmoteDelay3, SoundEntriesID, EmotesID, Flags FROM broadcast_text"); if (!result) { TC_LOG_INFO("server.loading", ">> Loaded 0 broadcast texts. DB table `broadcast_text` is empty."); @@ -9838,8 +9838,8 @@ void ObjectMgr::LoadBroadcastTextLocales() { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 - QueryResult result = WorldDatabase.Query("SELECT ID, locale, Text, Text1 FROM broadcast_text_locale"); + // 0 1 2 3 + QueryResult result = WorldDatabase.Query("SELECT ID, locale, `Text`, Text1 FROM broadcast_text_locale"); if (!result) { TC_LOG_INFO("server.loading", ">> Loaded 0 broadcast text locales. DB table `broadcast_text_locale` is empty."); |