*Merge tc1 commits 1582-1590

--HG--
branch : trunk

1 files changed, 10 insertions, 3 deletions

diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 63d8943469d..3d74a1d0f76 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -66,6 +66,12 @@ bool ChatHandler::HandleMuteCommand(const char* args)
         return false;
 
     uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
+    std::string mutereasonstr;
+    if(!mutereason)
+        mutereasonstr = "No reason.";
+    else
+        mutereasonstr = mutereason;
+        
 
     // find only player from same account if any
     if(!target)
@@ -88,11 +94,12 @@ bool ChatHandler::HandleMuteCommand(const char* args)
     LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'",uint64(mutetime), account_id );
 
     if(target)
-        ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime);
-
+        ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereasonstr.c_str());
+        
     std::string nameLink = playerLink(target_name);
 
-    PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink.c_str(), notspeaktime);
+    PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereasonstr.c_str());
+
     return true;
 }