- The big forward port. I probably broke lots of stuff, so please look over any

[ircu2.10.12-pk.git] / ircd / m_topic.c

diff --git a/ircd/m_topic.c b/ircd/m_topic.c
index b8cfc82822d0616b4af43318a33c5de8b28a0842..a41745c0fca6941bab5ad56e7c2dac68a4a5337d 100644 (file)
--- a/ircd/m_topic.c
+++ b/ircd/m_topic.c
@@ -161,14 +161,9 @@ int m_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       send_reply(sptr, ERR_NOTONCHANNEL, chptr->chname);
       continue;
     }
-    /* Modeless Channels don't have topics */
-    if (IsModelessChannel(name))
-    {
-      send_reply(sptr, ERR_CHANOPRIVSNEEDED, chptr->chname);
-      continue;
-    }
 
-    if (!topic)                 /* only asking for topic */
+    /* only asking for topic */
+    if (!topic)
     {
       if (chptr->topic[0] == '\0')
        send_reply(sptr, RPL_NOTOPIC, chptr->chname);
@@ -211,13 +206,6 @@ int ms_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
        send_reply(sptr,ERR_NOSUCHCHANNEL,name);
        continue;
     }
-    /* Modeless Channels don't have topics */
-    if (IsModelessChannel(name))
-    {
-      protocol_violation(sptr,"Attempted to topic modeless channel");
-      send_reply(sptr, ERR_CHANOPRIVSNEEDED, chptr->chname);
-      continue;
-    }
 
     /* Ignore requests for topics from remote servers */
     if (IsLocalChannel(name) && !MyUser(sptr))