From c202dea024542b9c6c6b771bb9a3a081d9eacdc5 Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Fri, 16 Aug 2013 12:10:55 +0200
Subject: Replace OnRehash() with ReadConfig() that is called on boot, on
 module load and on rehash

This eliminates the need for calling OnRehash() in init()
---
 src/modules/m_censor.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/modules/m_censor.cpp')

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
-- 
cgit v1.3.1-10-gc9f91