diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
| commit | daec51c435ca77914271200607841d55ff7408d7 (patch) | |
| tree | 15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /util | |
| parent | ba96c2f7db5ce079d7609dff90591b9872ba6143 (diff) | |
| parent | a540d613cd08b8feee096d19b727d1f5b2cab507 (diff) | |
| download | prosody-daec51c435ca77914271200607841d55ff7408d7.tar.gz prosody-daec51c435ca77914271200607841d55ff7408d7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/events.lua | 4 | ||||
| -rw-r--r-- | util/xml.lua | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/util/events.lua b/util/events.lua index 81fbc13f..d19da98b 100644 --- a/util/events.lua +++ b/util/events.lua @@ -53,6 +53,9 @@ function new() end end end; + local function get_handlers(event) + return handlers[event]; + end; local function add_handlers(handlers) for event, handler in pairs(handlers) do add_handler(event, handler); @@ -135,6 +138,7 @@ function new() remove_handler = remove_handler; add_handlers = add_handlers; remove_handlers = remove_handlers; + get_handlers = get_handlers; wrappers = { add_handler = add_wrapper; remove_handler = remove_wrapper; diff --git a/util/xml.lua b/util/xml.lua index 6dbed65d..3c1d3e51 100644 --- a/util/xml.lua +++ b/util/xml.lua @@ -11,6 +11,7 @@ local parse_xml = (function() local ns_separator = "\1"; local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$"; return function(xml) + --luacheck: ignore 212/self local handler = {}; local stanza = st.stanza("root"); function handler:StartElement(tagname, attr) |