diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-29 18:11:37 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-29 18:11:37 +0100 |
| commit | 041209a264222c8261ccff51df5f73bbbc23d6b8 (patch) | |
| tree | e014c22f857a0d2e2f96e817efc59cf6d9642e15 /util | |
| parent | 5dfe9cf891dc5becd805dfbad79653d9eb840001 (diff) | |
| parent | 273fa0fd8ac62a9f877033c659596fac911b4717 (diff) | |
| download | prosody-041209a264222c8261ccff51df5f73bbbc23d6b8.tar.gz prosody-041209a264222c8261ccff51df5f73bbbc23d6b8.zip | |
Merge with 0.5
Diffstat (limited to 'util')
| -rw-r--r-- | util/muc.lua | 4 |
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; |