diff options
author | Waqas Hussain <waqas20@gmail.com> | 2009-11-29 18:29:19 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2009-11-29 18:29:19 +0500 |
commit | ee490c5eabc83cb65e8fb2d83590fb62ba0c1140 (patch) | |
tree | 81fb5f90836938c9bff311d363840f11b62bb71f /core | |
parent | 513d6dfa4aaf3a68d89c4ecb150c3a89f25f8539 (diff) | |
parent | beb6fa2f210bbf8ea8d976f11728d20c5b41ad42 (diff) | |
download | prosody-ee490c5eabc83cb65e8fb2d83590fb62ba0c1140.tar.gz prosody-ee490c5eabc83cb65e8fb2d83590fb62ba0c1140.zip |
Merge with 0.6.
Diffstat (limited to 'core')
-rw-r--r-- | core/xmlhandlers.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua index d679af97..82c2d0b8 100644 --- a/core/xmlhandlers.lua +++ b/core/xmlhandlers.lua @@ -50,7 +50,7 @@ function init_xmlhandlers(session, stream_callbacks) chardata = {}; end local curr_ns,name = tagname:match("^([^\1]*)\1?(.*)$"); - if not name then + if name == "" then curr_ns, name = "", curr_ns; end @@ -63,7 +63,7 @@ function init_xmlhandlers(session, stream_callbacks) local k = attr[i]; attr[i] = nil; local ns, nm = k:match("^([^\1]*)\1?(.*)$"); - if ns and nm then + if nm ~= "" then ns = ns_prefixes[ns]; if ns then attr[ns..":"..nm] = attr[k]; @@ -105,7 +105,7 @@ function init_xmlhandlers(session, stream_callbacks) end function xml_handlers:EndElement(tagname) local curr_ns,name = tagname:match("^([^\1]*)\1?(.*)$"); - if not name then + if name == "" then curr_ns, name = "", curr_ns; end if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then |