diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-09-24 11:17:47 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-09-24 11:17:47 +0100 |
| commit | 41efc95388858b84f342545f5a139a7872782b8d (patch) | |
| tree | 1a4fca5c66111ac916066b40ea313f9b7f6acd14 /plugins | |
| parent | 801957dc9674d71b01f56e37d15ac6ae12134588 (diff) | |
| parent | 0b8360b9a110abb2915a19774af49137205310cb (diff) | |
| download | prosody-41efc95388858b84f342545f5a139a7872782b8d.tar.gz prosody-41efc95388858b84f342545f5a139a7872782b8d.zip | |
Merge with trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 6d74c7ba..fb72a9e3 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -187,7 +187,9 @@ function room_mt:send_history(to) end local function room_get_disco_info(self, stanza) - return st.reply(stanza):query("http://jabber.org/protocol/disco#info"):tag("identity", {category="conference", type="text"}); + return st.reply(stanza):query("http://jabber.org/protocol/disco#info") + :tag("identity", {category="conference", type="text"}):up() + :tag("feature", {var="http://jabber.org/protocol/muc"}); end local function room_get_disco_items(self, stanza) return st.reply(stanza):query("http://jabber.org/protocol/disco#items"); |