Merge branch 'develop' of https://github.com/ClouDev/CloudBot into develop

CONTRIBUTORS

@@ -3,14 +3,21 @@ Thanks to everyone who has contributed to CloudBot! Come in IRC and ping me if I
 Luke Rogers (lukeroge)
 Neersighted
 blha303
-KsaRedFx
-urbels
 cybojenix
+KsaRedFx
+nathanblaney
+thenoodle68
+nasonfish
+urbels
+puffrfish
+Sepero
+TheFiZi
+mikeleigh
 Spudstabber
 frozenMC
 frdmn
-puffrfish
-nasonfish
+
+
 
 We are using code from the following projects:
 ./plugins/mlia.py - https://github.com/infinitylabs/UguuBot

plugins/admin.py

@@ -187,10 +187,11 @@ def say(inp, conn=None, chan=None):
     If [channel] is blank the bot will say the <message> in the channel
     the command was used in."""
     inp = inp.split(" ")
-    message = " ".join(inp[1:])
     if inp[0][0] == "#":
+        message = " ".join(inp[1:])
         out = "PRIVMSG %s :%s" % (inp[0], message)
     else:
+        message = " ".join(inp[0:])
         out = "PRIVMSG %s :%s" % (chan, message)
     conn.send(out)