Accept topic changes from servers that do not send topic-set timestamps (fixes SF...

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1938 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 9fa3b4f7adbb6ab1f4508fe771da9f0fa572808f..1f51f03fe9d1e401e50bb06e16c8d6474138deba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-06  Michael Poole <mdpoole@troilus.org>
+
+       * 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 <mdpoole@troilus.org>
 
        * 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 8eebf458c1407eec5ed3b9ff8cf8c044b20955cd..4fb1a8f0d0384ecff1da3e9a2b6fc461f84e3738 100644 (file)
--- 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;