aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-08-05 17:21:19 +0100
committerMatthew Wild <mwild1@gmail.com>2012-08-05 17:21:19 +0100
commitbcb9e7e055f7bd808e4437571f54ffea9174b101 (patch)
treee484cf5d1806a0a3932418e65e4e4e39a1413e2a /plugins/muc
parent18fc86713ef365cb5d699bed2840dc7b8aef6995 (diff)
parent6ae2292381995460166fe1b1f47bdabbad1d04fe (diff)
downloadprosody-bcb9e7e055f7bd808e4437571f54ffea9174b101.tar.gz
prosody-bcb9e7e055f7bd808e4437571f54ffea9174b101.zip
Merge 0.9->trunk (who has been pushing to trunk?)
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/muc.lib.lua6
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