Merge 0.10->trunk

[prosody.git] / plugins / muc / name.lib.lua

diff --git a/plugins/muc/name.lib.lua b/plugins/muc/name.lib.lua
index 18400e92ca8bba3491a7c7c3b58b730dc7f114b1..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_description(event.room) or "";
 end);
 
 module:hook("muc-config-submitted/muc#roomconfig_roomname", function(event)