Merge branch 'master' into devel

2017-07-13 22:54:53 +02:00 · 2017-07-13 22:54:53 +02:00 · e56b0024c4
commit e56b0024c4
parent 58b6f41b7b f7830a5c29
3 changed files with 18 additions and 10 deletions
--- 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