Merge with trunk

Thu, 24 Sep 2009 11:17:47 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Thu, 24 Sep 2009 11:17:47 +0100
changeset 1817
5a86a9826b96
parent 1815
1c0bde3db7d8 (current diff)
parent 1816
e164fdb2d18f (diff)
child 1818
a394e0bd4847

Merge with trunk

--- a/plugins/muc/muc.lib.lua	Thu Sep 24 11:16:25 2009 +0100
+++ b/plugins/muc/muc.lib.lua	Thu Sep 24 11:17:47 2009 +0100
@@ -187,7 +187,9 @@
 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");

mercurial