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, 6 insertions, 9 deletions

diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index d0dea2625..67d1e5faa 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -321,6 +321,8 @@ class CommandCSMode : public Command
 							source.Reply(_("Missing parameter for mode \002{0}\002."), cm->mchar);
 						else if (cm->type == MODE_LIST && ci->c && IRCD->GetMaxListFor(ci->c) && ci->c->HasMode(cm->name) >= IRCD->GetMaxListFor(ci->c))
 							source.Reply(_("List for mode \002{0}\002 is full."), cm->mchar);
+						else if (ci->GetRefs<ModeLock *>(modelock).size() >= Config->GetModule(this->owner)->Get<unsigned>("max", "32"))
+							source.Reply(_("The mode lock list of \002{0}\002 is full."), ci->GetName());
 						else
 						{
 							mlocks->SetMLock(ci, cm, adding, mode_param, source.GetNick());
@@ -605,15 +607,10 @@ class CommandCSMode : public Command
 							}
 							else
 							{
-								std::pair<Channel::ModeList::iterator, Channel::ModeList::iterator> its = ci->c->GetModeList(cm->name);
-								for (; its.first != its.second;)
-								{
-									const Anope::string &mask = its.first->second;
-									++its.first;
-
-									if (Anope::Match(mask, param))
-										ci->c->RemoveMode(NULL, cm, mask);
-								}
+								std::vector<Anope::string> v = ci->c->GetModeList(cm->name);
+								for (unsigned j = 0; j < v.size(); ++j)
+									if (Anope::Match(v[j], param))
+										ci->c->RemoveMode(NULL, cm, v[j]);
 							}
 					}
 			}