From c15b8a598d525cd9ff555a748c88ec1fe67d7b58 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Thu, 7 Jan 2010 03:23:57 +0000 Subject: [PATCH] Accept topic changes from servers that do not send topic-set timestamps (fixes SF #2897520). git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1938 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 5 +++++ ircd/m_topic.c | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9fa3b4f..1f51f03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-06 Michael Poole + + * ircd/m_topic.c (ms_topic): When no topic timestamp is passed, + use the current time instead of the channel creation time. + 2010-01-06 Michael Poole * ircd/m_silence.c (m_silence): Only show the silence list for the diff --git a/ircd/m_topic.c b/ircd/m_topic.c index 8eebf45..4fb1a8f 100644 --- a/ircd/m_topic.c +++ b/ircd/m_topic.c @@ -197,6 +197,7 @@ int ms_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) if (parc > 3 && (ts = atoi(parv[2])) && chptr->creationtime < ts) continue; + ts = 0; /* Default to the current time if no topic_time is passed. */ if (parc > 4 && (ts = atoi(parv[3])) && chptr->topic_time > ts) continue; -- 2.20.1