Merge branch '2.0' into 2.1

Conflicts:
	cmake/Anope.cmake
	cmake/FindGettext.cmake
	include/access.h
	include/messages.h
	include/modes.h
	include/modules.h
	include/users.h
	modules/CMakeLists.txt
	modules/commands/bs_bot.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_ban.cpp
	modules/commands/cs_clone.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_list.cpp
	modules/commands/cs_log.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_status.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_updown.cpp
	modules/commands/cs_xop.cpp
	modules/commands/ms_check.cpp
	modules/commands/ns_access.cpp
	modules/commands/ns_cert.cpp
	modules/commands/ns_group.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_set.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_session.cpp
	modules/commands/os_svs.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_regex_pcre.cpp
	modules/extra/m_sql_authentication.cpp
	modules/extra/stats/m_chanstats.cpp
	modules/protocol/bahamut.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd12.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/chanserv/channel.cpp
	modules/pseudoclients/nickserv/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	src/access.cpp
	src/bots.cpp
	src/channels.cpp
	src/language.cpp
	src/modes.cpp
	src/modulemanager.cpp
	src/process.cpp
	src/users.cpp
	src/version.sh

1 files changed, 13 insertions, 4 deletions

diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp
index 7468331aa..0e487ff6c 100644
--- a/modules/commands/cs_updown.cpp
+++ b/modules/commands/cs_updown.cpp
@@ -81,8 +81,8 @@ class CommandCSUp : public Command
 			}
 
 			User *u = User::Find(nick, true);
-			Channel *c = ci->c;
 			User *srcu = source.GetUser();
+			Channel *c = ci->c;
 			bool override = false;
 
 			if (u == NULL)
@@ -90,9 +90,13 @@ class CommandCSUp : public Command
 				source.Reply(_("User \002{0}\002 isn't currently online."), nick);
 				return;
 			}
-
 			if (srcu && !srcu->FindChannel(c))
 			{
+				source.Reply(_("You must be in \002%s\002 to use this command."), c->name.c_str());
+				return;
+			}
+			else if (!u->FindChannel(c))
+			{
 				source.Reply(_("You must be on channel \002{0}\002 to use this command."), c->name);
 				return;
 			}
@@ -182,6 +186,7 @@ class CommandCSDown : public Command
 
 			User *u = User::Find(nick, true);
 			Channel *c = ci->c;
+
 			User *srcu = source.GetUser();
 			bool override = false;
 
@@ -196,8 +201,12 @@ class CommandCSDown : public Command
 				source.Reply(_("You must be on channel \002{0}\002 to use this command."), c->name);
 				return;
 			}
-
-			if (!u->FindChannel(c))
+			if (srcu && !srcu->FindChannel(c))
+			{
+				source.Reply(_("You must be in \002%s\002 to use this command."), c->name.c_str());
+				return;
+			}
+			else if (!u->FindChannel(c))
 			{
 				source.Reply(_("\002%s\002 is not on channel %s."), u->nick, c->name);
 				return;