diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-26 22:22:43 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-26 22:22:43 +0100 |
| commit | 8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e (patch) | |
| tree | 1c5e65e70f484393b24c0bcd9ecd9f6c30d55922 /tools | |
| parent | 1f1a2de16515a5ab250965768cf76f64271f8884 (diff) | |
| parent | 42c4183e34f2a15920d3df042eed5531b552c495 (diff) | |
| download | prosody-8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e.tar.gz prosody-8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index e9dbd2dc..66bf4f93 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -44,8 +44,10 @@ function build_stanza(tuple, stanza) for _, a in ipairs(tuple[4]) do build_stanza(a, stanza); end if up then stanza:up(); else return stanza end elseif tuple[1] == "xmlcdata" then - assert(type(tuple[2]) == "string", "XML CDATA has unexpected type: "..type(tuple[2])); - stanza:text(tuple[2]); + if type(tuple[2]) ~= "table" then + assert(type(tuple[2]) == "string", "XML CDATA has unexpected type: "..type(tuple[2])); + stanza:text(tuple[2]); + end -- else it's [], i.e., the null value, used for the empty string else error("unknown element type: "..serialize(tuple)); end |