aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-04 09:18:53 +0100
committerKim Alvefur <zash@zash.se>2016-02-04 09:18:53 +0100
commit7b11f2c6503e05ad3281b30c4998a8faaea3e418 (patch)
tree6d903721403765ab70992035ec87b439b7b76f1e /plugins
parent189039bd778c59fd5cb5c366160e3223635b18b1 (diff)
downloadprosody-7b11f2c6503e05ad3281b30c4998a8faaea3e418.tar.gz
prosody-7b11f2c6503e05ad3281b30c4998a8faaea3e418.zip
MUC: Roll back parts of 50b9a7e86de9 that were not in the disco#info event
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/description.lib.lua2
-rw-r--r--plugins/muc/name.lib.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/description.lib.lua b/plugins/muc/description.lib.lua
index d94bc3f1..c4b1bd09 100644
--- a/plugins/muc/description.lib.lua
+++ b/plugins/muc/description.lib.lua
@@ -24,8 +24,8 @@ local function add_form_option(event)
name = "muc#roomconfig_roomdesc";
type = "text-single";
label = "Description";
+ value = get_description(event.room) or "";
});
- event.formdata["muc#roomconfig_roomdesc"] = get_description(event.room) or "";
end
module:hook("muc-disco#info", add_form_option);
module:hook("muc-config-form", add_form_option);
diff --git a/plugins/muc/name.lib.lua b/plugins/muc/name.lib.lua
index 302c2992..d9bfc4cf 100644
--- a/plugins/muc/name.lib.lua
+++ b/plugins/muc/name.lib.lua
@@ -30,8 +30,8 @@ module:hook("muc-config-form", function(event)
name = "muc#roomconfig_roomname";
type = "text-single";
label = "Name";
+ value = get_name(event.room) or "";
});
- event.formdata["muc#roomconfig_roomname"] = get_name(event.room) or "";
end);
module:hook("muc-config-submitted/muc#roomconfig_roomname", function(event)