diff options
| author | Adam <Adam@anope.org> | 2012-04-23 05:17:02 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-04-23 05:17:02 -0400 |
| commit | 3d84dc91f6a3304e1efd791ee8241b20499b36fc (patch) | |
| tree | 946c86111e82a23d4c596d08184876fa351d57bb /src | |
| parent | 573e49a7ead331219eb6f0d3ca9cf83e793a5c9c (diff) | |
| parent | b752c3a668e035a75e0989ae85fddc893aec53f9 (diff) | |
Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.cpp | 4 | ||||
| -rw-r--r-- | src/servers.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 283da3440..9c943ab67 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -537,7 +537,7 @@ void Channel::SetMode(const BotInfo *bi, ChannelMode *cm, const Anope::string &p } ModeManager::StackerAdd(bi, this, cm, true, param); - SetModeInternal(bi ? finduser(bi->nick) : NULL, cm, param, EnforceMLock); + SetModeInternal(bi, cm, param, EnforceMLock); } /** @@ -589,7 +589,7 @@ void Channel::RemoveMode(const BotInfo *bi, ChannelMode *cm, const Anope::string } ModeManager::StackerAdd(bi, this, cm, false, realparam); - RemoveModeInternal(bi ? finduser(bi->nick) : NULL, cm, realparam, EnforceMLock); + RemoveModeInternal(bi, cm, realparam, EnforceMLock); } /** diff --git a/src/servers.cpp b/src/servers.cpp index 416b35723..650625cdb 100644 --- a/src/servers.cpp +++ b/src/servers.cpp @@ -70,7 +70,7 @@ Server::Server(Server *uplink, const Anope::string &name, unsigned hops, const A if (cm == NULL) cm = ModeManager::FindChannelModeByChar(ModeManager::GetStatusChar(want_modes[j])); if (cm && cm->Type == MODE_STATUS) - c->SetModeInternal(bi ? finduser(bi->nick) : NULL, cm, bi->nick); + c->SetModeInternal(bi, cm, bi->nick); } } } |