mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-24 03:29:28 +01:00
Owner: Fix bug with @enable and @disable if a plugin is given. Closes GH-43. Closes GH-44.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 8fb97c56bc
)
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
This commit is contained in:
parent
b42b06fe79
commit
b99525db63
@ -537,11 +537,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)
|
||||||
@ -557,8 +557,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)
|
||||||
|
Loading…
Reference in New Issue
Block a user