Fix kicknorejoin not showing the channel name properly in errors.

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index c4e55c3ca4db806fc31ab3afb1acdcc0b97ed85b..7174310874d453c8992e1857712c9a7527322087 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -283,9 +283,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        if (command_p.size() < handler->min_params)
        {
                user->CommandFloodPenalty += failpenalty;
-               user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters.");
-               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length()))
-                       user->WriteNumeric(RPL_SYNTAX, handler->name, handler->syntax);
+               handler->TellNotEnoughParameters(user, command_p);
                FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
                return;
        }
@@ -293,7 +291,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        if ((user->registered != REG_ALL) && (!handler->works_before_reg))
        {
                user->CommandFloodPenalty += failpenalty;
-               user->WriteNumeric(ERR_NOTREGISTERED, command, "You have not registered");
+               handler->TellNotRegistered(user, command_p);
                FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
        }
        else