From 6d1c1cb51753f986b86b408a5828373d0066624b Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Thu, 29 Mar 2018 17:45:56 +0100
Subject: Always process MOTD formatting escape codes.

The options for disabling these were added to keep compatibility
with previous 2.0 releases and are not needed any more.
---
 src/modules/m_opermotd.cpp | 4 +---
 src/modules/m_showfile.cpp | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 30f2ce303..6884cd447 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -100,14 +100,12 @@ class ModuleOpermotd : public Module
 		{
 			FileReader reader(conf->getString("file", "opermotd"));
 			cmd.opermotd = reader.GetVector();
+			InspIRCd::ProcessColors(cmd.opermotd);
 		}
 		catch (CoreException&)
 		{
 			// Nothing happens here as we do the error handling in ShowOperMOTD.
 		}
-
-		if (conf->getBool("processcolors"))
-			InspIRCd::ProcessColors(cmd.opermotd);
 	}
 };
 
diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 2d1354aff..83030b7a1 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -91,8 +91,7 @@ class CommandShowFile : public Command
 			method = SF_NOTICE;
 
 		contents = filecontents;
-		if (tag->getBool("colors"))
-			InspIRCd::ProcessColors(contents);
+		InspIRCd::ProcessColors(contents);
 	}
 };
 
-- 
cgit v1.2.3