ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.0.x/modules/m_tburst.c
(Generate patch)

Comparing ircd-hybrid-8/modules/m_tburst.c (file contents):
Revision 1474 by michael, Sun Jul 22 14:44:07 2012 UTC vs.
Revision 1485 by michael, Fri Jul 27 08:15:55 2012 UTC

# Line 87 | Line 87 | ms_tburst(struct Client *client_p, struc
87     *        The TS of the remote channel is equal to ours AND
88     *        the TS of the remote topic is newer than ours
89     */
90 <  if (remote_channel_ts < chptr->channelts)
90 >  if (HasFlag(source_p, FLAGS_SERVICE))
91 >    accept_remote = 1;
92 >  else if (remote_channel_ts < chptr->channelts)
93      accept_remote = 1;
94    else if (remote_channel_ts == chptr->channelts)
95      if (remote_topic_ts > chptr->topic_time)
# Line 95 | Line 97 | ms_tburst(struct Client *client_p, struc
97  
98    if (accept_remote)
99    {
98 –    int topic_differs = strncmp(chptr->topic, topic, sizeof(chptr->topic) - 1);
99 –
100      set_channel_topic(chptr, topic, setby, remote_topic_ts);
101  
102 <    if (topic_differs)
102 >    if (strncmp(chptr->topic, topic, sizeof(chptr->topic) - 1))
103        sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s TOPIC %s :%s",
104                             ConfigServerHide.hide_servers ? me.name : source_p->name,
105                             chptr->chname, chptr->topic);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)