summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2012-10-02 22:59:20 -0400
committerAdam <Adam@anope.org>2012-10-02 22:59:20 -0400
commit47bc551485f46f6195850be1c2a5edb1d8998e30 (patch)
tree819429547978a437a591e499c00202f6f9566ee9 /src
parent87478187af9f6f670ebf679ce7cc6cc29b21f7af (diff)
Revert "Fix topiclock on inspircd"
This reverts commit 87478187af9f6f670ebf679ce7cc6cc29b21f7af.
Diffstat (limited to 'src')
-rw-r--r--src/channels.cpp4
-rw-r--r--src/protocol.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 78709ed59..c95e46373 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -910,12 +910,12 @@ void Channel::ChangeTopic(const Anope::string &user, const Anope::string &newtop
{
User *u = finduser(user);
- ircdproto->SendTopic(this->ci->WhoSends(), this, newtopic, u ? u->nick : user, ts);
-
this->topic = newtopic;
this->topic_setter = u ? u->nick : user;
this->topic_time = ts;
+ ircdproto->SendTopic(this->ci->WhoSends(), this);
+
FOREACH_MOD(I_OnTopicUpdated, OnTopicUpdated(this, user, this->topic));
if (this->ci)
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 6be9804c1..14fe249ed 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -119,9 +119,9 @@ void IRCDProto::SendNumericInternal(int numeric, const Anope::string &dest, cons
UplinkSocket::Message(Me) << n << " " << dest << " " << buf;
}
-void IRCDProto::SendTopic(BotInfo *bi, Channel *c, const Anope::string &topic, const Anope::string &, time_t &)
+void IRCDProto::SendTopic(BotInfo *bi, Channel *c)
{
- UplinkSocket::Message(bi) << "TOPIC " << c->name << " :" << topic;
+ UplinkSocket::Message(bi) << "TOPIC " << c->name << " :" << c->topic;
}
void IRCDProto::SendSVSKill(const BotInfo *source, User *user, const char *fmt, ...)