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

2013-08-01 19:05:45 +12:00 · 2013-08-01 19:05:45 +12:00 · 28dd4cf5f7
commit 28dd4cf5f7
parent 9becfa9897 baa98ee5cc
1 changed files with 1 additions and 0 deletions
--- a/core/irc.py
+++ b/core/irc.py
@ -17,6 +17,7 @@ def decode(txt):


 def censor(text):
+    text = text.replace('\n', '').replace('\r', '')
    replacement = '[censored]'
    if 'censored_strings' in bot.config:
        words = map(re.escape, bot.config['censored_strings'])