trunk
changeset 5088:d5bb9cd2e6df
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2012 16:32:40 +0100 |
| parents | 71a5a6a6c74c 1ef9aa0c9fb0 |
| children | a5b683909f79 61c7c53c06d5 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line diff
1.1 --- a/plugins/muc/muc.lib.lua Fri Aug 10 16:31:51 2012 +0100 1.2 +++ b/plugins/muc/muc.lib.lua Fri Aug 10 16:32:40 2012 +0100 1.3 @@ -525,7 +525,9 @@ 1.4 if type == "error" or type == "result" and stanza.name == "iq" then 1.5 local id = stanza.attr.id; 1.6 stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza); 1.7 - self:_route_stanza(stanza); 1.8 + if stanza.attr.id then 1.9 + self:_route_stanza(stanza); 1.10 + end 1.11 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id; 1.12 else 1.13 origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); 1.14 @@ -549,7 +551,9 @@ 1.15 if type == 'get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then 1.16 stanza.attr.to = jid_bare(stanza.attr.to); 1.17 end 1.18 - self:_route_stanza(stanza); 1.19 + if stanza.attr.id then 1.20 + self:_route_stanza(stanza); 1.21 + end 1.22 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id; 1.23 else -- message 1.24 stanza.attr.from = current_nick;