diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-03 07:23:33 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-03 07:23:33 +0100 |
| commit | c92bbefd9c5e36913afe0d796a84df180faaf0af (patch) | |
| tree | 8f9e7c6a07ec34aa279eca57118f12972e1b10f7 /tools | |
| parent | c5c7ef5b0f47d1e51117f756420176f1f0a2466d (diff) | |
| parent | 6712a420669b560523170bedbe03f13ee941c52e (diff) | |
| download | prosody-c92bbefd9c5e36913afe0d796a84df180faaf0af.tar.gz prosody-c92bbefd9c5e36913afe0d796a84df180faaf0af.zip | |
Merge 0.9->0.10
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 8297278f..e9dbd2dc 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -163,7 +163,7 @@ end function muc_room(node, host, properties) local store = { jid = node.."@"..host, _data = {}, _affiliations = {} }; for _,aff in ipairs(properties.affiliations) do - store._affiliations[_table_to_jid(aff[1])] = aff[2]; + store._affiliations[_table_to_jid(aff[1])] = aff[2][1] or aff[2]; end store._data.subject = properties.subject; if properties.subject_author then |