summaryrefslogtreecommitdiff
path: root/modules/commands/os_kill.cpp
diff options
context:
space:
mode:
authorlethality <lethality@anope.org>2012-06-22 21:26:33 +0100
committerlethality <lethality@anope.org>2012-06-22 21:26:33 +0100
commitd8a99d619f7ae301ecf188dc460b1f5c7cb791ac (patch)
treeb327ce05b9b5cb598fbc829e48041d465bc2d579 /modules/commands/os_kill.cpp
parentba53c7eb03add30acefbbc95bbd8b4b825b465b0 (diff)
parent2dec8e767a70def4b9b04a96ae4f75e4d1013038 (diff)
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'modules/commands/os_kill.cpp')
-rw-r--r--modules/commands/os_kill.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/commands/os_kill.cpp b/modules/commands/os_kill.cpp
index bee5777ea..e7f78b1b5 100644
--- a/modules/commands/os_kill.cpp
+++ b/modules/commands/os_kill.cpp
@@ -24,7 +24,6 @@ class CommandOSKill : public Command
void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
{
- User *u = source.u;
const Anope::string &nick = params[0];
Anope::string reason = params.size() > 1 ? params[1] : "";
@@ -38,8 +37,8 @@ class CommandOSKill : public Command
if (reason.empty())
reason = "No reason specified";
if (Config->AddAkiller)
- reason = "(" + u->nick + ") " + reason;
- Log(LOG_ADMIN, u, this) << "on " << u2->nick << " for " << reason;
+ reason = "(" + source.GetNick() + ") " + reason;
+ Log(LOG_ADMIN, source, this) << "on " << u2->nick << " for " << reason;
u2->Kill(Config->OperServ, reason);
}
}