diff options
| author | lethality <lethality@anope.org> | 2012-06-22 21:26:33 +0100 |
|---|---|---|
| committer | lethality <lethality@anope.org> | 2012-06-22 21:26:33 +0100 |
| commit | d8a99d619f7ae301ecf188dc460b1f5c7cb791ac (patch) | |
| tree | b327ce05b9b5cb598fbc829e48041d465bc2d579 /modules/commands/cs_appendtopic.cpp | |
| parent | ba53c7eb03add30acefbbc95bbd8b4b825b465b0 (diff) | |
| parent | 2dec8e767a70def4b9b04a96ae4f75e4d1013038 (diff) | |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'modules/commands/cs_appendtopic.cpp')
| -rw-r--r-- | modules/commands/cs_appendtopic.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/commands/cs_appendtopic.cpp b/modules/commands/cs_appendtopic.cpp index fe1633b8a..70cde7b7b 100644 --- a/modules/commands/cs_appendtopic.cpp +++ b/modules/commands/cs_appendtopic.cpp @@ -52,14 +52,13 @@ class CommandCSAppendTopic : public Command { const Anope::string &newtopic = params[1]; - User *u = source.u; Channel *c = findchan(params[0]);; if (!c) source.Reply(CHAN_X_NOT_IN_USE, params[0].c_str()); else if (!c->ci) source.Reply(CHAN_X_NOT_REGISTERED, c->name.c_str()); - else if (!c->ci->AccessFor(u).HasPriv("TOPIC") && !u->HasCommand("chanserv/topic")) + else if (!source.AccessFor(c->ci).HasPriv("TOPIC") && !source.HasCommand("chanserv/topic")) source.Reply(ACCESS_DENIED); else { @@ -74,12 +73,12 @@ class CommandCSAppendTopic : public Command bool has_topiclock = c->ci->HasFlag(CI_TOPICLOCK); c->ci->UnsetFlag(CI_TOPICLOCK); - c->ChangeTopic(u->nick, topic, Anope::CurTime); + c->ChangeTopic(source.GetNick(), topic, Anope::CurTime); if (has_topiclock) c->ci->SetFlag(CI_TOPICLOCK); - bool override = !c->ci->AccessFor(u).HasPriv("TOPIC"); - Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, c->ci) << "to append: " << topic; + bool override = !source.AccessFor(c->ci).HasPriv("TOPIC"); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, c->ci) << "to append: " << topic; } return; } |