diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-08-10 16:32:40 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-08-10 16:32:40 +0100 |
| commit | b93ae92930131a853434cf622113714ad33bec26 (patch) | |
| tree | 35fcc5411f88b421c8694d27a515ec4f9efbe63a | |
| parent | 96824a74d241b48cb0d966723dea6cf15cf70f39 (diff) | |
| parent | 62c6400a8c96d350fd6a6f5f596f6601b59bab0d (diff) | |
| download | prosody-b93ae92930131a853434cf622113714ad33bec26.tar.gz prosody-b93ae92930131a853434cf622113714ad33bec26.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/muc/muc.lib.lua | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index ae6b8e54..a7603535 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -525,7 +525,9 @@ function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc if type == "error" or type == "result" and stanza.name == "iq" then local id = stanza.attr.id; stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza); - self:_route_stanza(stanza); + if stanza.attr.id then + self:_route_stanza(stanza); + end stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id; else origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); @@ -549,7 +551,9 @@ function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc if type == 'get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then stanza.attr.to = jid_bare(stanza.attr.to); end - self:_route_stanza(stanza); + if stanza.attr.id then + self:_route_stanza(stanza); + end stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id; else -- message stanza.attr.from = current_nick; |