aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-10-05 12:15:25 -0400
committerMatthew Wild <mwild1@gmail.com>2013-10-05 12:15:25 -0400
commitfa21be14b2c444aa7848c401e2be40bdd101e67a (patch)
tree60b60df11d3d619d45a50bf81f67e73dec1d032e /plugins
parent6f46b6cd1a2f6cc65a55cbca524c664b78f219f5 (diff)
parent94f5252228eb755833151ecfecb21e36862fb4b9 (diff)
downloadprosody-fa21be14b2c444aa7848c401e2be40bdd101e67a.tar.gz
prosody-fa21be14b2c444aa7848c401e2be40bdd101e67a.zip
Merge 0.9->0.10
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 0565d692..1b76ec94 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -202,7 +202,7 @@ function room_mt:get_disco_info(stanza)
:tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up()
:add_child(dataform.new({
{ name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" },
- { name = "muc#roominfo_description", label = "Description"},
+ { name = "muc#roominfo_description", label = "Description", value = "" },
{ name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) }
}):form({["muc#roominfo_description"] = self:get_description()}, 'result'))
;