diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-25 18:11:24 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-25 18:11:24 +0200 |
commit | 3d29bb52de30cc4662a167d2cdab046c7d642b74 (patch) | |
tree | acb98cdf0005d65cefb429affb0e7d9d11cf37f7 | |
parent | c77e828701faec6e9d1321a57440453e868ab9a0 (diff) | |
parent | a10c1e367fdd3fd641596b4276765c0286ca3ea0 (diff) | |
download | prosody-3d29bb52de30cc4662a167d2cdab046c7d642b74.tar.gz prosody-3d29bb52de30cc4662a167d2cdab046c7d642b74.zip |
Merge 0.9->0.10
-rwxr-xr-x | tools/xep227toprosody.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/xep227toprosody.lua b/tools/xep227toprosody.lua index e95a9d59..521851e9 100755 --- a/tools/xep227toprosody.lua +++ b/tools/xep227toprosody.lua @@ -202,7 +202,7 @@ function lxp_handlers.StartElement(parser, elementname, attributes) --count = count + 1; if curr_host ~= "" then -- forward to xmlhandlers - user_handlers:StartElement(elementname, attributes); + user_handlers.StartElement(parser, elementname, attributes); elseif (curr_ns == xmlns_xep227) and (name == "host") then curr_host = attributes["jid"]; -- start of host element print("Begin parsing host "..curr_host); @@ -226,7 +226,7 @@ function lxp_handlers.EndElement(parser, elementname) curr_host = "" -- end of host element else -- forward to xmlhandlers - user_handlers:EndElement(elementname); + user_handlers.EndElement(parser, elementname); end elseif (curr_ns ~= xmlns_xep227) or (name ~= "server-data") then io.stderr:write("Unhandled XML element: ", name, "\n"); @@ -237,7 +237,7 @@ end function lxp_handlers.CharacterData(parser, string) if curr_host ~= "" then -- forward to xmlhandlers - user_handlers:CharacterData(string); + user_handlers.CharacterData(parser, string); end end |