MUC: Roll back parts of 50b9a7e86de9 that were not in the disco#info event

diff --git a/plugins/muc/description.lib.lua b/plugins/muc/description.lib.lua
index d94bc3f1a6314fd04d27ced11752da7fc16ac46e..c4b1bd093c7df86d1e060e419ae9e16426b5dd84 100644 (file)
--- 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 302c29924949d569a492f6a3f00ff1b3136ccc6c..d9bfc4cf0f0a2315ca447ef7daaaa9c4ecf9d5de 100644 (file)
--- 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)