summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <adam@sigterm.info>2015-09-06 17:00:57 -0400
committerAdam <adam@sigterm.info>2015-09-06 17:00:57 -0400
commite6601069038c35c546fd3f3dce95024b0d13f1b4 (patch)
tree8f3eecc055517cb05c20f5bc0b5614c845ff9fed
parent1aa4fa1496bd8a71ce6fe5f5f82eb4b951b0c131 (diff)
parentf543c4516a66b2eb371121a7189da58ed9f60722 (diff)
Merge pull request #1018 from SaberUK/insp20+hidekills
[2.0] Fix exposing the opers hostname in KILL when using hidekills.
-rw-r--r--src/commands/cmd_kill.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commands/cmd_kill.cpp b/src/commands/cmd_kill.cpp
index 17c8a76a0..99ac39d42 100644
--- a/src/commands/cmd_kill.cpp
+++ b/src/commands/cmd_kill.cpp
@@ -134,7 +134,7 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
u->Write(":%s KILL %s :%s!%s!%s (%s)", ServerInstance->Config->HideKillsServer.empty() ? user->GetFullHost().c_str() : ServerInstance->Config->HideKillsServer.c_str(),
u->nick.c_str(),
ServerInstance->Config->ServerName.c_str(),
- user->dhost.c_str(),
+ ServerInstance->Config->HideKillsServer.empty() ? user->dhost.c_str() : ServerInstance->Config->HideKillsServer.c_str(),
ServerInstance->Config->HideKillsServer.empty() ? user->nick.c_str() : ServerInstance->Config->HideKillsServer.c_str(),
parameters[1].c_str());
}