aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-07-29 18:02:05 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-07-29 18:02:05 +0500
commit273fa0fd8ac62a9f877033c659596fac911b4717 (patch)
treeb1dd17963c09da7ed83ec2a5b2395c6ac27c9f17 /util
parentf72cd22f0ce3697c8239d59ba0e0355c2963e5b7 (diff)
downloadprosody-273fa0fd8ac62a9f877033c659596fac911b4717.tar.gz
prosody-273fa0fd8ac62a9f877033c659596fac911b4717.zip
MUC: Added the MUC child element to conflict errorsvault/0.5.10.5.1
Diffstat (limited to 'util')
-rw-r--r--util/muc.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/muc.lua b/util/muc.lua
index b3673f63..badcffce 100644
--- a/util/muc.lua
+++ b/util/muc.lua
@@ -209,7 +209,7 @@ local function room_handle_to_occupant(self, origin, stanza) -- PM, vCards, etc
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 @@ local function room_handle_to_occupant(self, origin, stanza) -- PM, vCards, etc
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;