# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1344612760 -3600
# Node ID d5bb9cd2e6dfa66484f6a74d7596bad9b6f95406
# Parent  71a5a6a6c74cad000d8fadfd3c13759264d7fd6a# Parent  1ef9aa0c9fb0abbe3e7d8ed19adb7dabbd79724d
Merge 0.9->trunk

diff -r 71a5a6a6c74c -r d5bb9cd2e6df plugins/muc/muc.lib.lua
--- 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;