diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-05-18 23:53:02 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-05-18 23:53:02 +0100 |
| commit | c7136a5b2cc9e6da35df23c4f4dfa7d0668e5a28 (patch) | |
| tree | 4b152687bf60b9bb1ea1730f4a09e40a07840d23 /core/modulemanager.lua | |
| parent | ee999e986754503cb185b1363da0e8200acee9b4 (diff) | |
| download | prosody-c7136a5b2cc9e6da35df23c4f4dfa7d0668e5a28.tar.gz prosody-c7136a5b2cc9e6da35df23c4f4dfa7d0668e5a28.zip | |
moduleapi, modulemanager: Re-structure module.event_handlers so that the same handler can harmlessly handle multiple events (thanks Zash)
Diffstat (limited to 'core/modulemanager.lua')
| -rw-r--r-- | core/modulemanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index b9f221c8..417dedbe 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -91,8 +91,8 @@ local function do_unload_module(host, name) end end - for handler, event in pairs(mod.module.event_handlers) do - event.object.remove_handler(event.name, handler); + for event, data in pairs(mod.module.event_handlers) do + data.object.remove_handler(event, data.handler); end if mod.module.items then -- remove items |