Merge branch 'master' of git://supybot.git.sourceforge.net/gitroot/supybot/supybot into testing

This commit is contained in:
Valentin Lorentz 2011-08-06 19:00:32 +02:00
commit a2546e70a1
1 changed files with 3 additions and 1 deletions

View File

@ -241,7 +241,9 @@ class Topic(callbacks.Plugin):
def do315(self, irc, msg):
# Try to restore the topic when not set yet.
channel = msg.args[1]
c = irc.state.channels[channel]
c = irc.state.channels.get(channel)
if c is None:
return
if irc.nick not in c.ops and 't' in c.modes:
self.log.debug('Not trying to restore topic in %s. I\'m not opped '
'and %s is +t.', channel, channel)