Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/PathGenerator.cpp

1 files changed, 9 insertions, 17 deletions

diff --git a/src/server/shared/Logging/AppenderDB.cpp b/src/server/shared/Logging/AppenderDB.cpp
index 8b237277d79..204592720dc 100644
--- a/src/server/shared/Logging/AppenderDB.cpp
+++ b/src/server/shared/Logging/AppenderDB.cpp
@@ -25,25 +25,17 @@ AppenderDB::~AppenderDB() { }
 
 void AppenderDB::_write(LogMessage const& message)
 {
-    if (!enabled)
+    // Avoid infinite loop, PExecute triggers Logging with "sql.sql" type
+    if (!enabled || !message.type.find("sql"))
         return;
 
-    switch (message.type)
-    {
-        case LOG_FILTER_SQL:
-        case LOG_FILTER_SQL_DRIVER:
-        case LOG_FILTER_SQL_DEV:
-            break; // Avoid infinite loop, PExecute triggers Logging with LOG_FILTER_SQL type
-        default:
-            PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG);
-            stmt->setUInt64(0, message.mtime);
-            stmt->setUInt32(1, realmId);
-            stmt->setUInt8(2, uint8(message.type));
-            stmt->setUInt8(3, uint8(message.level));
-            stmt->setString(4, message.text);
-            LoginDatabase.Execute(stmt);
-            break;
-    }
+    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG);
+    stmt->setUInt64(0, message.mtime);
+    stmt->setUInt32(1, realmId);
+    stmt->setString(2, message.type);
+    stmt->setUInt8(3, uint8(message.level));
+    stmt->setString(4, message.text);
+    LoginDatabase.Execute(stmt);
 }
 
 void AppenderDB::setRealmId(uint32 _realmId)