Addendum to r11303, fix for bug #833: use correct result for the type (bitmask/record...

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 4435b3324cb6205cfae8f3a538615b7a796d7f20..19899d300e87821c6f144b77d353c5ac837da604 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -393,13 +393,10 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
                                        }
                                }
 
-                               if (Ptr->bans.size())
+                               if (Ptr->IsBanned(user) && !can_bypass)
                                {
-                                       if (Ptr->IsBanned(user) && !can_bypass)
-                                       {
-                                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
-                                               return NULL;
-                                       }
+                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
+                                       return NULL;
                                }
 
                                /*