X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/34d8ef4d14dfcef13f8aab3746b30c6f8cacb4a1..4b4fc78cfba459be6bd20cbaafff3f0606ae4116:/modules/m_topic.c

diff --git a/modules/m_topic.c b/modules/m_topic.c
index 4b6d44b..6b77805 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -116,7 +116,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 			return 0;
 		}
 
-		if(MyClient(source_p) && (chptr->mode.mode & MODE_TOPICLIMIT) && !is_chanop(msptr))
+		if(MyClient(source_p) && (chptr->mode.mode & MODE_TOPICLIMIT) && !is_any_op(msptr) && !can_send(chptr, source_p, msptr))
 		{
 			if(IsOverride(source_p))
 			{
@@ -125,7 +125,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 						get_oper_name(source_p), chptr->chname);
 				sendto_server(NULL, chptr, NOCAPS, NOCAPS,
 						":%s WALLOPS :%s is overriding TOPIC on [%s]",
-						use_id(source_p), get_oper_name(source_p), chptr->chname);
+						me.name, get_oper_name(source_p), chptr->chname);
 			}
 			else
 			{