Fix a regression in m_cloaking

[user/henk/code/inspircd.git] / src / modules / m_satopic.cpp

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index a0e3319af25d95d44e7df7e1143748b07823c1af..4a6f855369276dba2b3fb6fd865571e0454a9713 100644 (file)
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -17,8 +17,6 @@
  */
 
 
-/* $ModDesc: Provides a SATOPIC command */
-
 #include "inspircd.h"
 
 /** Handle /SATOPIC
@@ -40,17 +38,15 @@ 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;
                }
                else
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
                        return CMD_FAILURE;
                }
        }
@@ -62,15 +58,10 @@ class ModuleSATopic : public Module
  public:
        ModuleSATopic()
        : cmd(this)
-       {
-               ServerInstance->AddCommand(&cmd);
-       }
-
-       virtual ~ModuleSATopic()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides a SATOPIC command", VF_VENDOR);
        }