Fix infinite loop on alias expansion, found by Adam

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

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 57f3416e78ff95f71d5b1ac70c53188b00834795..9e57e3cd7cad66c199c6d1bde2f90bf1c91dabd0 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -270,20 +270,20 @@ class ModuleSilence : public Module
        CommandSVSSilence cmdsvssilence;
  public:
 
-       ModuleSilence(InspIRCd* Me)
-               : Module(Me), maxsilence(32), cmdsilence(this, maxsilence), cmdsvssilence(this)
+       ModuleSilence()
+               : maxsilence(32), cmdsilence(this, maxsilence), cmdsvssilence(this)
        {
                OnRehash(NULL);
                ServerInstance->AddCommand(&cmdsilence);
                ServerInstance->AddCommand(&cmdsvssilence);
 
-               Implementation eventlist[] = { I_OnRehash, I_OnBuildExemptList, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite };
-               ServerInstance->Modules->Attach(eventlist, this, 6);
+               Implementation eventlist[] = { I_OnRehash, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
        void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
                if (!maxsilence)
                        maxsilence = 32;
@@ -368,7 +368,7 @@ class ModuleSilence : public Module
 
        Version GetVersion()
        {
-               return Version("Provides support for the /SILENCE command", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for the /SILENCE command", VF_COMMON | VF_VENDOR);
        }
 };