From 1773eef143bc7bc63e7ffb2da124ea46ae770982 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Wed, 19 Jun 2013 20:53:40 -0400
Subject: Don't enforce usestrictprivmsg on TS6 IRCds and cache the value of
 usestrictprivmsg

---
 src/config.cpp   | 3 ++-
 src/messages.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/config.cpp b/src/config.cpp
index 98b813ee7..4b16d8e97 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -182,7 +182,8 @@ Conf::Conf() : Block("")
 
 	this->ReadTimeout = options->Get<time_t>("readtimeout");
 	this->UsePrivmsg = options->Get<bool>("useprivmsg");
-	this->StrictPrivmsg = !options->Get<bool>("usestrictprivmsg") ? "/msg " : "/";
+	this->UseStrictPrivmsg = options->Get<bool>("usestrictprivmsg");
+	this->StrictPrivmsg = !UseStrictPrivmsg ? "/msg " : "/";
 	{
 		std::vector<Anope::string> defaults;
 		spacesepstream(this->GetModule("nickserv")->Get<const Anope::string>("defaults")).GetTokens(defaults);
diff --git a/src/messages.cpp b/src/messages.cpp
index fcaeffa43..1fcc8b898 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -300,7 +300,7 @@ void Privmsg::Run(MessageSource &source, const std::vector<Anope::string> &param
 			if (!servername.equals_ci(Me->GetName()))
 				return;
 		}
-		else if (Config->GetBlock("options")->Get<bool>("usestrictprivmsg"))
+		else if (!IRCD->RequiresID && Config->UseStrictPrivmsg)
 		{
 			const BotInfo *bi = BotInfo::Find(receiver);
 			if (!bi)
-- 
cgit