Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

1 files changed, 9 insertions, 1 deletions

diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp
index e9d67b52e..2850e0203 100644
--- a/modules/commands/os_list.cpp
+++ b/modules/commands/os_list.cpp
@@ -67,7 +67,7 @@ class CommandOSChanList : public Command
 			{
 				Channel *c = cit->second;
 
-				if (!pattern.empty() && !Anope::Match(c->name, pattern))
+				if (!pattern.empty() && !Anope::Match(c->name, pattern, false, true))
 					continue;
 				if (!Modes.empty())
 					for (std::list<ChannelModeName>::iterator it = Modes.begin(), it_end = Modes.end(); it != it_end; ++it)
@@ -102,6 +102,10 @@ class CommandOSChanList : public Command
 				"is given, lists only the channels the user using it is on. If SECRET is\n"
 				"specified, lists only channels matching \002pattern\002 that have the +s or\n"
 				"+p mode."));
+		if (!Config->RegexEngine.empty())
+			source.Reply(" \n"
+					"Regex matches are also supported using the %s engine.\n"
+					"Enclose your pattern in // if this desired.", Config->RegexEngine.c_str());
 		return true;
 	}
 };
@@ -194,6 +198,10 @@ class CommandOSUserList : public Command
 				"the format nick!user@host). If \002channel\002 is given, lists only users\n"
 				"that are on the given channel. If INVISIBLE is specified, only users\n"
 				"with the +i flag will be listed."));
+		if (!Config->RegexEngine.empty())
+			source.Reply(" \n"
+					"Regex matches are also supported using the %s engine.\n"
+					"Enclose your pattern in // if this desired.", Config->RegexEngine.c_str());
 		return true;
 	}
 };