Software / code / prosody
Changeset
5088:d5bb9cd2e6df
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2012 16:32:40 +0100 |
| parents | 5087:71a5a6a6c74c (current diff) 5086:1ef9aa0c9fb0 (diff) |
| children | 5089:a5b683909f79 5090:61c7c53c06d5 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua Fri Aug 10 16:31:51 2012 +0100 +++ b/plugins/muc/muc.lib.lua Fri Aug 10 16:32:40 2012 +0100 @@ -525,7 +525,9 @@ 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 @@ 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;
