diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-01 08:56:56 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-01 08:56:56 +0300 |
| commit | cab8005bf3c8a188a7fee5a176d13c79d20e34c3 (patch) | |
| tree | a0cbf6ddfa9ba5f961f50a3cdaed7aa99f7a6e1e | |
| parent | Send trailer and close socket explicitly on stream end (diff) | |
Display muc#roomconfig_changesubject in room's disco#info
Fixes #2449
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | src/mod_muc_room.erl | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rebar.config b/rebar.config index cb30f6003..a9dccaac1 100644 --- a/rebar.config +++ b/rebar.config @@ -25,7 +25,7 @@ {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.22"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.11"}}}, {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.30"}}}, - {xmpp, ".*", {git, "https://github.com/processone/xmpp", "6999333"}}, + {xmpp, ".*", {git, "https://github.com/processone/xmpp", "6e3feb7"}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.14"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}}, diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 4f7070741..94c9ae327 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -3848,6 +3848,7 @@ iq_disco_info_extras(Lang, StateData) -> Fs1 = [{description, (StateData#state.config)#config.description}, {occupants, ?DICT:size(StateData#state.nicks)}, {contactjid, get_owners(StateData)}, + {changesubject, (StateData#state.config)#config.allow_change_subj}, {lang, (StateData#state.config)#config.lang}], Fs2 = case (StateData#state.config)#config.pubsub of Node when is_binary(Node), Node /= <<"">> -> |