aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-06-14 16:30:45 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-06-14 16:30:45 +0500
commit84f9d6c5315c6b5d936663fcdab4442e4b192714 (patch)
tree247726ca3264c907ed8f1d39cb427c6a9f85b138
parentda05cf050d1e28c408c432a54249eb52a73dd348 (diff)
downloadprosody-84f9d6c5315c6b5d936663fcdab4442e4b192714.tar.gz
prosody-84f9d6c5315c6b5d936663fcdab4442e4b192714.zip
util.muc: Don't reply with an error in response to unacceptable result stanzas
-rw-r--r--util/muc.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/muc.lua b/util/muc.lua
index 6b505c7c..6e7e152d 100644
--- a/util/muc.lua
+++ b/util/muc.lua
@@ -262,7 +262,7 @@ local function room_handle_to_occupant(self, origin, stanza) -- PM, vCards, etc
elseif type ~= 'result' then -- bad type
origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
end
- elseif not current_nick and type ~= "error" then -- not in room
+ elseif not current_nick and type ~= "error" and type ~= "result" then -- not in room
origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM
origin.send(st.error_reply(stanza, "modify", "bad-request"));