From d736eba00b274c87662bd73a3acf8288135643d6 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Sun, 5 Jan 2014 14:17:12 +0100
Subject: Improve UserManager::QuitUser() and related code

- Make operreason optional; NULL means same as quitreason
- Remove User::quietquit, it is now handled internally in spanningtree
- Send snotice about quitting remote users from spanningtree
---
 src/commands/cmd_quit.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/commands/cmd_quit.cpp')

diff --git a/src/commands/cmd_quit.cpp b/src/commands/cmd_quit.cpp
index 61a88e2b5..144f4675b 100644
--- a/src/commands/cmd_quit.cpp
+++ b/src/commands/cmd_quit.cpp
@@ -56,21 +56,14 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
 			quitmsg = ServerInstance->Config->FixedQuit;
 		else
 			quitmsg = parameters.size() ?
-				ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit
+				ServerInstance->Config->PrefixQuit + parameters[0] + ServerInstance->Config->SuffixQuit
 				: "Client exited";
 	}
 	else
 		quitmsg = parameters.size() ? parameters[0] : "Client exited";
 
 	std::string* operquit = ServerInstance->OperQuit.get(user);
-	if (operquit)
-	{
-		ServerInstance->Users->QuitUser(user, quitmsg, operquit->c_str());
-	}
-	else
-	{
-		ServerInstance->Users->QuitUser(user, quitmsg);
-	}
+	ServerInstance->Users->QuitUser(user, quitmsg, operquit);
 
 	return CMD_SUCCESS;
 }
-- 
cgit v1.3.1-10-gc9f91