Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

2 files changed, 4 insertions, 4 deletions

diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index 2be778a1028..5e24608715a 100755
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -408,13 +408,13 @@ class DatabaseWorkerPool
         }
 
         //! Apply escape string'ing for current collation. (utf8)
-        void escape_string(std::string& str)
+        void EscapeString(std::string& str)
         {
             if (str.empty())
                 return;
 
             char* buf = new char[str.size()*2+1];
-            escape_string(buf, str.c_str(), str.size());
+            EscapeString(buf, str.c_str(), str.size());
             str = buf;
             delete[] buf;
         }
@@ -441,7 +441,7 @@ class DatabaseWorkerPool
         }
 
     private:
-        unsigned long escape_string(char *to, const char *from, unsigned long length)
+        unsigned long EscapeString(char *to, const char *from, unsigned long length)
         {
             if (!to || !from || !length)
                 return 0;
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index e755e7208c3..ac74f893d58 100755
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -364,7 +364,7 @@ void Log::outDB(LogTypes type, const char * str)
     std::string new_str(str);
     if (new_str.empty())
         return;
-    LoginDatabase.escape_string(new_str);
+    LoginDatabase.EscapeString(new_str);
 
     LoginDatabase.PExecute("INSERT INTO logs (time, realm, type, string) "
         "VALUES (" UI64FMTD ", %u, %u, '%s');", uint64(time(0)), realm, type, new_str.c_str());