aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-10-02 22:37:03 +0100
committerMatthew Wild <mwild1@gmail.com>2009-10-02 22:37:03 +0100
commitfbfa652fba6fe4ccf3d019e57bd8f916454f5fa8 (patch)
treeaa55923217a3ab63ead9ef10bef0c370b2ce9d43
parent26b86f46a9ccec536984e9d5b5e73dfad7d88cae (diff)
downloadprosody-fbfa652fba6fe4ccf3d019e57bd8f916454f5fa8.tar.gz
prosody-fbfa652fba6fe4ccf3d019e57bd8f916454f5fa8.zip
util.muc: Fix location of <x> element on error replies
-rw-r--r--util/muc.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/muc.lua b/util/muc.lua
index badcffce..24c7a1d0 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"):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 @@ 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"):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;