Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Mon, 03 Feb 2014 07:23:33 +0100
changeset 6007 ff24bc2d41a6
parent 6005 98b768a41c9d (current diff)
parent 6006 95ce7bfbfa6f (diff)
child 6008 e6f735c62c5d
child 6010 fad7084a0b35
Merge 0.9->0.10
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