Always set the topic in Channel::SetTopic(), move access checks into cmd_topic

2 files changed, 3 insertions, 5 deletions

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index ff1a35ba9..0b4d96c0f 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -197,7 +197,7 @@ public:
 				c = new Channel(channel, ServerInstance->Time());
 				if (!topic.empty())
 				{
-					c->SetTopic(ServerInstance->FakeClient, topic, true);
+					c->SetTopic(ServerInstance->FakeClient, topic);
 
 					/*
 					 * Due to the way protocol works in 1.2, we need to hack the topic TS in such a way that this
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index c15c9e91b..56098635b 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -40,10 +40,8 @@ class CommandSATopic : public Command
 
 		if(target)
 		{
-			std::string newTopic = parameters[1];
-
-			// 3rd parameter overrides access checks
-			target->SetTopic(user, newTopic, true);
+			const std::string& newTopic = parameters[1];
+			target->SetTopic(user, newTopic);
 			ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
 			return CMD_SUCCESS;