Merge pull request #545 from SaberUK/master+logging-cleanup

[user/henk/code/inspircd.git] / src / commands / cmd_join.cpp

diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp
index da2ec1b4576fbf4654b474ab88256f7245fadfac..a88509bc26c00314f5a500c083facb4f8ba6199d 100644 (file)
--- a/src/commands/cmd_join.cpp
+++ b/src/commands/cmd_join.cpp
@@ -55,7 +55,7 @@ CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, L
                if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, 1, false))
                        return CMD_SUCCESS;
 
-               if (ServerInstance->IsChannel(parameters[0], ServerInstance->Config->Limits.ChanMax))
+               if (ServerInstance->IsChannel(parameters[0]))
                {
                        Channel::JoinUser(user, parameters[0], false, parameters[1]);
                        return CMD_SUCCESS;
@@ -66,7 +66,7 @@ CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, L
                if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, -1, false))
                        return CMD_SUCCESS;
 
-               if (ServerInstance->IsChannel(parameters[0], ServerInstance->Config->Limits.ChanMax))
+               if (ServerInstance->IsChannel(parameters[0]))
                {
                        Channel::JoinUser(user, parameters[0]);
                        return CMD_SUCCESS;