Mercurial > lxmppd-hg-xmllex / file diff

--- a/util/muc.lua	Fri Oct 02 21:23:32 2009 +0100
+++ b/util/muc.lua	Fri Oct 02 22:37:03 2009 +0100
@@ -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"):tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+							origin.send(st.error_reply(stanza, "cancel", "conflict"):up():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"):tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+					origin.send(st.error_reply(stanza, "cancel", "conflict"):up():tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
 				else
 					log("debug", "%s joining as %s", from, to);
 					local data;