Merge branch '2.0' into 2.1

Conflicts:
	CMakeLists.txt
	include/modules.h
	include/serialize.h
	modules/commands/bs_assign.cpp
	modules/commands/bs_badwords.cpp
	modules/commands/bs_bot.cpp
	modules/commands/bs_control.cpp
	modules/commands/bs_kick.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_akick.cpp
	modules/commands/cs_drop.cpp
	modules/commands/cs_entrymsg.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_invite.cpp
	modules/commands/cs_kick.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_register.cpp
	modules/commands/cs_seen.cpp
	modules/commands/cs_set.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_topic.cpp
	modules/commands/cs_unban.cpp
	modules/commands/cs_xop.cpp
	modules/commands/hs_del.cpp
	modules/commands/hs_list.cpp
	modules/commands/hs_request.cpp
	modules/commands/ms_ignore.cpp
	modules/commands/ms_send.cpp
	modules/commands/ns_recover.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_dns.cpp
	modules/commands/os_noop.cpp
	modules/commands/os_oper.cpp
	modules/commands/os_session.cpp
	modules/database/db_sql_live.cpp
	modules/encryption/enc_bcrypt.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_ldap_oper.cpp
	modules/fantasy.cpp
	modules/m_dnsbl.cpp
	modules/m_sasl.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	modules/webcpanel/webcpanel.cpp
	modules/webcpanel/webcpanel.h
	src/command.cpp
	src/messages.cpp
	src/modulemanager.cpp
	src/regchannel.cpp
	src/serialize.cpp

1 files changed, 8 insertions, 8 deletions

diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index b5025203f..3465faae7 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -296,6 +296,9 @@ class CommandOSSNLine : public CommandOSSXLineBase
 		if (mask[masklen - 1] == ' ')
 			mask.erase(masklen - 1);
 
+		if (Config->GetModule("operserv")->Get<bool>("addakiller", "yes") && !source.GetNick().empty())
+			reason = "[" + source.GetNick() + "] " + reason;
+
 		if (!this->xlm()->CanAdd(source, mask, expires, reason))
 			return;
 		else if (mask.find_first_not_of("/.*?") == Anope::string::npos)
@@ -304,9 +307,6 @@ class CommandOSSNLine : public CommandOSSXLineBase
 			return;
 		}
 
-		if (Config->GetModule("operserv")->Get<bool>("addakiller", "yes") && !source.GetNick().empty())
-			reason = "[" + source.GetNick() + "] " + reason;
-
 		XLine *x = new XLine(mask, source.GetNick(), expires, reason);
 		if (Config->GetModule("operserv")->Get<bool>("akillids"))
 			x->SetID(XLineManager::GenerateUID());
@@ -344,7 +344,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
 				User *user = it->second;
 
 				if (!user->HasMode("OPER") && user->server != Me && this->xlm()->Check(user, x))
-					user->Kill(Me->GetName(), rreason);
+					user->Kill(Me, rreason);
 			}
 
 			this->xlm()->Send(NULL, x);
@@ -501,6 +501,9 @@ class CommandOSSQLine : public CommandOSSXLineBase
 			}
 		}
 
+		if (Config->GetModule("operserv")->Get<bool>("addakiller", "yes") && !source.GetNick().empty())
+			reason = "[" + source.GetNick() + "] " + reason;
+
 		if (!this->sqlines->CanAdd(source, mask, expires, reason))
 			return;
 		else if (mask.find_first_not_of("./?*") == Anope::string::npos)
@@ -509,9 +512,6 @@ class CommandOSSQLine : public CommandOSSXLineBase
 			return;
 		}
 
-		if (Config->GetModule("operserv")->Get<bool>("addakiller", "yes") && !source.GetNick().empty())
-			reason = "[" + source.GetNick() + "] " + reason;
-
 		XLine *x = new XLine(mask, source.GetNick(), expires, reason);
 		if (Config->GetModule("operserv")->Get<bool>("akillids"))
 			x->SetID(XLineManager::GenerateUID());
@@ -574,7 +574,7 @@ class CommandOSSQLine : public CommandOSSXLineBase
 					User *user = it->second;
 
 					if (!user->HasMode("OPER") && user->server != Me && this->xlm()->Check(user, x))
-						user->Kill(Me->GetName(), rreason);
+						user->Kill(Me, rreason);
 				}
 			}