diff options
| author |  brain | 2008-04-16 00:36:20 +0000 |
|---|---|---|
| committer | brain | 2008-04-16 00:36:20 +0000 |
| commit | 3039e0663f7e45a45e9574a6aa7463bbe77e849f (patch) | |
| tree | 936c1bf5f4c9ba2ade1dc722932d75a5f2a6dde9 /src/channels.cpp | |
| parent | ahh shit, remove windows specific code i left laying around (diff) | |
| download | inspircd++-3039e0663f7e45a45e9574a6aa7463bbe77e849f.tar.gz inspircd++-3039e0663f7e45a45e9574a6aa7463bbe77e849f.tar.bz2 inspircd++-3039e0663f7e45a45e9574a6aa7463bbe77e849f.zip | |
Change that allows the m_override module to not announce a key override for a user that specified the right key
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9516 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 838013c4c..b0de06267 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -278,7 +278,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool if (IS_LOCAL(user) && override == false) { MOD_RESULT = 0; - FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs)); + FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, NULL, cname, privs, key ? key : "")); if (MOD_RESULT == 1) return NULL; } @@ -298,7 +298,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool if (IS_LOCAL(user) && override == false) { MOD_RESULT = 0; - FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs)); + FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, Ptr, cname, privs, key ? key : "")); if (MOD_RESULT == 1) { return NULL; |