aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/m_censor.cpp
diff options
context:
space:
mode:
authorGravatar attilamolnar2013-08-16 12:10:55 +0200
committerGravatar attilamolnar2013-08-30 13:15:10 +0200
commitc202dea024542b9c6c6b771bb9a3a081d9eacdc5 (patch)
tree64f4d5f5c18e685d3cd360107664eec644d5585d /src/modules/m_censor.cpp
parentMerge insp20 (diff)
downloadinspircd++-c202dea024542b9c6c6b771bb9a3a081d9eacdc5.tar.gz
inspircd++-c202dea024542b9c6c6b771bb9a3a081d9eacdc5.tar.bz2
inspircd++-c202dea024542b9c6c6b771bb9a3a081d9eacdc5.zip
Replace OnRehash() with ReadConfig() that is called on boot, on module load and on rehash
This eliminates the need for calling OnRehash() in init()
Diffstat (limited to 'src/modules/m_censor.cpp')
-rw-r--r--src/modules/m_censor.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 747c16d83..fe0321ab1 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -55,9 +55,6 @@ class ModuleCensor : public Module
void init() CXX11_OVERRIDE
{
- /* Read the configuration file on startup.
- */
- OnRehash(NULL);
ServerInstance->Modules->AddService(cu);
ServerInstance->Modules->AddService(cc);
}
@@ -103,7 +100,7 @@ class ModuleCensor : public Module
return MOD_RES_PASSTHRU;
}
- void OnRehash(User* user) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
/*
* reload our config file on rehash - we must destroy and re-allocate the classes