From 7fb31d31608f9706e2091a451a185ee333232c00 Mon Sep 17 00:00:00 2001
From: Vincent Le Goff <vincent.legoff.srs@gmail.com>
Date: Sun, 2 Jul 2017 16:23:49 -0700
Subject: [PATCH] Let ChannelCommand.arg_regex override the value set by the
 CHANNEL_HANDLER

---
 evennia/comms/channelhandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/comms/channelhandler.py b/evennia/comms/channelhandler.py
index 520b0934d9..30f54c5d95 100644
--- a/evennia/comms/channelhandler.py
+++ b/evennia/comms/channelhandler.py
@@ -66,6 +66,7 @@ class ChannelCommand(command.Command):
     key = "general"
     help_category = "Channel Names"
     obj = None
+    arg_regex = r"\s.*?|/history.*?"
 
     def parse(self):
         """
@@ -212,7 +213,6 @@ class ChannelHandler(object):
                              locks="cmd:all();%s" % channel.locks,
                              help_category="Channel names",
                              obj=channel,
-                             arg_regex=r"\s.*?|/history.*?",
                              is_channel=True)
         # format the help entry
         key = channel.key