diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-08-05 17:21:19 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-08-05 17:21:19 +0100 |
| commit | f6edccc24c0ebf7b4ec86826d66259ba1cad8f0d (patch) | |
| tree | e484cf5d1806a0a3932418e65e4e4e39a1413e2a /plugins | |
| parent | e1cf1cf3880e871b4d28c6dc18d97eefa0122f32 (diff) | |
| parent | a5b04b23ec4dbbe5674b0ab596427193877923d6 (diff) | |
| download | prosody-f6edccc24c0ebf7b4ec86826d66259ba1cad8f0d.tar.gz prosody-f6edccc24c0ebf7b4ec86826d66259ba1cad8f0d.zip | |
Merge 0.9->trunk (who has been pushing to trunk?)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 6d37fbcc..ae6b8e54 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -541,7 +541,11 @@ function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid); if stanza.name == "iq" then local id = stanza.attr.id; - stanza.attr.from, stanza.attr.to, stanza.attr.id = construct_stanza_id(self, stanza); + if stanza.attr.type == "get" or stanza.attr.type == "set" then + stanza.attr.from, stanza.attr.to, stanza.attr.id = construct_stanza_id(self, stanza); + else + stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza); + end if type == 'get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then stanza.attr.to = jid_bare(stanza.attr.to); end |