aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-10-05 22:19:55 +0200
committerKim Alvefur <zash@zash.se>2020-10-05 22:19:55 +0200
commitb449f58ba170b2970a37d2ed479a1f155f9077ca (patch)
tree060ba2b8121870957dd27611f33460643ccaedf6
parent37bcd4270edd9923e495bd94fc7e888eade0baca (diff)
parent75a5751bf387a033461fc3c5db338ab23893ae93 (diff)
downloadprosody-b449f58ba170b2970a37d2ed479a1f155f9077ca.tar.gz
prosody-b449f58ba170b2970a37d2ed479a1f155f9077ca.zip
Merge 0.11->trunk
-rw-r--r--plugins/muc/subject.lib.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/subject.lib.lua b/plugins/muc/subject.lib.lua
index c8b99cc7..3230817c 100644
--- a/plugins/muc/subject.lib.lua
+++ b/plugins/muc/subject.lib.lua
@@ -31,10 +31,10 @@ end
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)