diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-10-05 12:15:25 -0400 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-10-05 12:15:25 -0400 |
| commit | df8b4c6f4d2e853a146ca8f978b69f614de30105 (patch) | |
| tree | 60b60df11d3d619d45a50bf81f67e73dec1d032e /plugins | |
| parent | 83a82fbd237c3377016d366d4e1b3cf55b06d108 (diff) | |
| parent | 659122537866e289e4fd7b45afb99493ad0883b8 (diff) | |
| download | prosody-df8b4c6f4d2e853a146ca8f978b69f614de30105.tar.gz prosody-df8b4c6f4d2e853a146ca8f978b69f614de30105.zip | |
Merge 0.9->0.10
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 2 |
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')) ; |