Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Mon, 05 Oct 2020 22:19:55 +0200
changeset 11145 a5acd6354845
parent 11143 2187643b8e20 (current diff)
parent 11144 e17b98feb0b7 (diff)
child 11147 818255f49297
Merge 0.11->trunk
plugins/muc/subject.lib.lua
util/dependencies.lua
--- a/plugins/muc/subject.lib.lua	Mon Oct 05 21:54:17 2020 +0200
+++ b/plugins/muc/subject.lib.lua	Mon Oct 05 22:19:55 2020 +0200
@@ -31,10 +31,10 @@
 
 module:hook("muc-disco#info", function (event)
 	table.insert(event.form, {
-		name = "muc#roominfo_changesubject";
+		name = "muc#roomconfig_changesubject";
 		type = "boolean";
 	});
-	event.formdata["muc#roominfo_changesubject"] = get_changesubject(event.room);
+	event.formdata["muc#roomconfig_changesubject"] = get_changesubject(event.room);
 end);
 
 module:hook("muc-config-form", function(event)