m_spanningtree Remove remains of the KeepNickTS workaround

[user/henk/code/inspircd.git] / src / modules / m_modenotice.cpp

diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp
index 8998ea8b1c8bc3792216319f452502a7bfc7b622..e02c9147faf4156b415c501a6b07337c5f0b890f 100644 (file)
--- a/src/modules/m_modenotice.cpp
+++ b/src/modules/m_modenotice.cpp
@@ -30,6 +30,7 @@ class CommandModeNotice : public Command
 
        CmdResult Handle(const std::vector<std::string>& parameters, User *src)
        {
+               std::string msg = "*** From " + src->nick + ": " + parameters[1];
                int mlen = parameters[0].length();
                for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
                {
@@ -39,8 +40,7 @@ class CommandModeNotice : public Command
                                if (!user->IsModeSet(parameters[0][n]))
                                        goto next_user;
                        }
-                       user->Write(":%s NOTICE %s :*** From %s: %s", ServerInstance->Config->ServerName.c_str(),
-                               user->nick.c_str(), src->nick.c_str(), parameters[1].c_str());
+                       user->WriteNotice(msg);
 next_user:     ;
                }
                return CMD_SUCCESS;