Merge branch 'testing' of github.com:ProgVal/Limnoria into mkaysi

plugins/Unix/config.py

@@ -58,7 +58,7 @@ conf.registerGroup(Unix, 'fortune')
 conf.registerGlobalValue(Unix.fortune, 'command',
     registry.String(utils.findBinaryInPath('fortune') or '', _("""Determines
     what command will be called for the fortune command.""")))
-conf.registerGlobalValue(Unix.fortune, 'short',
+conf.registerChannelValue(Unix.fortune, 'short',
     registry.Boolean(True, _("""Determines whether only short fortunes will be
     used if possible.  This sends the -s option to the fortune program.""")))
 conf.registerGlobalValue(Unix.fortune, 'equal',
@@ -66,7 +66,7 @@ conf.registerGlobalValue(Unix.fortune, 'equal',
     weight to the different fortune databases.  If false, then larger
     databases will be given more weight.  This sends the -e option to the
     fortune program.""")))
-conf.registerGlobalValue(Unix.fortune, 'offensive',
+conf.registerChannelValue(Unix.fortune, 'offensive',
     registry.Boolean(False, _("""Determines whether fortune will retrieve
     offensive fortunes along with the normal fortunes.  This sends the -a
     option to the fortune program.""")))

plugins/Unix/plugin.py

@@ -196,14 +196,15 @@ class Unix(callbacks.Plugin):
 
         Returns a fortune from the *nix fortune program.
         """
+        channel = msg.args[0]
         fortuneCmd = self.registryValue('fortune.command')
         if fortuneCmd:
             args = [fortuneCmd]
-            if self.registryValue('fortune.short'):
+            if self.registryValue('fortune.short', channel):
                 args.append('-s')
             if self.registryValue('fortune.equal'):
                 args.append('-e')
-            if self.registryValue('fortune.offensive'):
+            if self.registryValue('fortune.offensive', channel):
                 args.append('-a')
             args.extend(self.registryValue('fortune.files'))
             try: