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

Conflicts:
	src/server/game/AI/CoreAI/TotemAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.h
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp

1 files changed, 2 insertions, 14 deletions

diff --git a/src/server/shared/Logging/Logger.cpp b/src/server/shared/Logging/Logger.cpp
index ea8ed27ed03..6fff993e2ae 100644
--- a/src/server/shared/Logging/Logger.cpp
+++ b/src/server/shared/Logging/Logger.cpp
@@ -25,13 +25,6 @@ void Logger::Create(std::string const& _name, LogLevel _level)
     level = _level;
 }
 
-Logger::~Logger()
-{
-    for (AppenderMap::iterator it = appenders.begin(); it != appenders.end(); ++it)
-        it->second = NULL;
-    appenders.clear();
-}
-
 std::string const& Logger::getName() const
 {
     return name;
@@ -49,12 +42,7 @@ void Logger::addAppender(uint8 id, Appender* appender)
 
 void Logger::delAppender(uint8 id)
 {
-    AppenderMap::iterator it = appenders.find(id);
-    if (it != appenders.end())
-    {
-        it->second = NULL;
-        appenders.erase(it);
-    }
+    appenders.erase(id);
 }
 
 void Logger::setLogLevel(LogLevel _level)
@@ -66,7 +54,7 @@ void Logger::write(LogMessage& message) const
 {
     if (!level || level > message.level || message.text.empty())
     {
-        //fprintf(stderr, "Logger::write: Logger %s, Level %u. Msg %s Level %u WRONG LEVEL MASK OR EMPTY MSG\n", getName().c_str(), messge.level, message.text.c_str(), .message.level); // DEBUG - RemoveMe
+        //fprintf(stderr, "Logger::write: Logger %s, Level %u. Msg %s Level %u WRONG LEVEL MASK OR EMPTY MSG\n", getName().c_str(), getLogLevel(), message.text.c_str(), message.level);
         return;
     }