Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-14 22:49:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'progval/testing' into HEAD

Browse Source
This commit is contained in:
Mika Suomalainen 2011-06-29 16:54:19 +03:00
commit 02568e50d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Owner/plugin.py
View File

@ -540,11 +540,11 @@ class Owner(callbacks.Plugin):
if plugin.isCommand(command): if plugin.isCommand(command):
pluginCommand = '%s.%s' % (plugin.name(), command) pluginCommand = '%s.%s' % (plugin.name(), command)
conf.supybot.commands.disabled().add(pluginCommand) conf.supybot.commands.disabled().add(pluginCommand)
plugin._disabled.add(command)
else: else:
irc.error('%s is not a command in the %s plugin.' % irc.error('%s is not a command in the %s plugin.' %
(command, plugin.name())) (command, plugin.name()))
return return
self._disabled.add(pluginCommand, plugin.name())
else: else:
conf.supybot.commands.disabled().add(command) conf.supybot.commands.disabled().add(command)
self._disabled.add(command) self._disabled.add(command)
@ -560,8 +560,8 @@ class Owner(callbacks.Plugin):
""" """
try: try:
if plugin: if plugin:
plugin._disabled.remove(command, plugin.name())
command = '%s.%s' % (plugin.name(), command) command = '%s.%s' % (plugin.name(), command)
self._disabled.remove(command, plugin.name())
else: else:
self._disabled.remove(command) self._disabled.remove(command)
conf.supybot.commands.disabled().remove(command) conf.supybot.commands.disabled().remove(command)