# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1248872525 -18000
# Node ID a63ff2fbba8d0a29503e7552a29fc7c831faa23c
# Parent  7acb630bdac94bb624a21c5061f0ab0c6b147dfa
MUC: Added the MUC child element to conflict errors

diff -r 7acb630bdac9 -r a63ff2fbba8d util/muc.lua
--- a/util/muc.lua	Wed Jul 29 18:01:14 2009 +0500
+++ b/util/muc.lua	Wed Jul 29 18:02:05 2009 +0500
@@ -209,7 +209,7 @@
 					else -- change nick
 						if self._participants[to] then
 							log("debug", "%s couldn't change nick", current_nick);
-							origin.send(st.error_reply(stanza, "cancel", "conflict"));
+							origin.send(st.error_reply(stanza, "cancel", "conflict"):tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
 						else
 							local data = self._participants[current_nick];
 							local to_nick = select(3, jid_split(to));
@@ -240,7 +240,7 @@
 				end
 				if not new_nick then
 					log("debug", "%s couldn't join due to nick conflict: %s", from, to);
-					origin.send(st.error_reply(stanza, "cancel", "conflict"));
+					origin.send(st.error_reply(stanza, "cancel", "conflict"):tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
 				else
 					log("debug", "%s joining as %s", from, to);
 					local data;