# HG changeset patch # User Kim Alvefur # Date 1391408613 -3600 # Node ID ff24bc2d41a6203ab0421b5fba3a130dc5a84549 # Parent 98b768a41c9db44c4d75ad04bf58bead123e1859# Parent 95ce7bfbfa6f88aba66eb1d46b98530c86496c04 Merge 0.9->0.10 diff -r 98b768a41c9d -r ff24bc2d41a6 tools/ejabberd2prosody.lua --- a/tools/ejabberd2prosody.lua Fri Jan 31 12:01:12 2014 +0100 +++ b/tools/ejabberd2prosody.lua Mon Feb 03 07:23:33 2014 +0100 @@ -163,7 +163,7 @@ 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