*Merge.

--HG--
branch : trunk

1 files changed, 5 insertions, 8 deletions

diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 3d74a1d0f76..ec38b3c57ac 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -66,12 +66,9 @@ bool ChatHandler::HandleMuteCommand(const char* args)
         return false;
 
     uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
-    std::string mutereasonstr;
+    char *mutereason = strtok(NULL, " ");
     if(!mutereason)
-        mutereasonstr = "No reason.";
-    else
-        mutereasonstr = mutereason;
-        
+        strcpy(mutereason, "No reason.");
 
     // find only player from same account if any
     if(!target)
@@ -94,11 +91,11 @@ 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, mutereasonstr.c_str());
-        
+        ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereason);
+
     std::string nameLink = playerLink(target_name);
 
-    PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereasonstr.c_str());
+    PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereason);
 
     return true;
 }