diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-03 07:25:05 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-03 07:25:05 +0100 |
| commit | 7a257adaffd2bc14ac33045c4563d428b41d69cb (patch) | |
| tree | c840902603d1482af5f9156d6170461fd47b8e69 /tools | |
| parent | 4159b9cfe19ede5b674a3328944c4ca02de99cd7 (diff) | |
| parent | c92bbefd9c5e36913afe0d796a84df180faaf0af (diff) | |
| download | prosody-7a257adaffd2bc14ac33045c4563d428b41d69cb.tar.gz prosody-7a257adaffd2bc14ac33045c4563d428b41d69cb.zip | |
Merge 0.10->trunk
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 |