Merge with 0.5

[prosody.git] / plugins / muc / muc.lib.lua

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index fb72a9e3007646094aa932e64ce9c287905259f3..6d74c7ba9613ecddf4599918470081d0c23c4633 100644 (file)
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -187,9 +187,7 @@ 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"}):up()
-               :tag("feature", {var="http://jabber.org/protocol/muc"});
+       return st.reply(stanza):query("http://jabber.org/protocol/disco#info"):tag("identity", {category="conference", type="text"});
 end
 local function room_get_disco_items(self, stanza)
        return st.reply(stanza):query("http://jabber.org/protocol/disco#items");