diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2013-01-22 08:30:38 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2013-01-22 08:30:38 +0500 |
| commit | 0f2d3d7139c741b6bd8714048694ee16a9b11c91 (patch) | |
| tree | 9938dd9411cf02b2c7cc7a82103633f7378030b8 /plugins/muc/muc.lib.lua | |
| parent | 1ae08f23d712da167747a7d59feac9965d6ef9ac (diff) | |
| parent | b1f22daa932ac857022412e734533ff05bad1594 (diff) | |
| download | prosody-0f2d3d7139c741b6bd8714048694ee16a9b11c91.tar.gz prosody-0f2d3d7139c741b6bd8714048694ee16a9b11c91.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/muc/muc.lib.lua')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 9755ba65..16a0238d 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -529,7 +529,7 @@ function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc self:_route_stanza(stanza); end stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id; - else + elseif type ~= "error" then origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); end elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM |