aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-11 01:53:32 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-11 01:53:32 +0100
commit703e7dde18717b1f0adc4891d39d288aa4258444 (patch)
treec6d3dd80f6be503871411f837d01ca82f344457e /plugins/muc
parent0b4567a6f194544d51d8574cf94f2f06056e83d3 (diff)
parentbbf9d411b846c78408bb4429ebe2dcf3f71d27b2 (diff)
downloadprosody-703e7dde18717b1f0adc4891d39d288aa4258444.tar.gz
prosody-703e7dde18717b1f0adc4891d39d288aa4258444.zip
Merge with Maranda
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/muc.lib.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 9be1736f..0203df26 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -744,7 +744,11 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha
local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns;
if stanza.name == "iq" then
if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" then
- origin.send(self:get_disco_info(stanza));
+ if stanza.tags[1].attr.node then
+ origin.send(st.error_reply(stanza, "cancel", "feature-not-implemented"));
+ else
+ origin.send(self:get_disco_info(stanza));
+ end
elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" then
origin.send(self:get_disco_items(stanza));
elseif xmlns == "http://jabber.org/protocol/muc#admin" then