diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-07-31 12:35:06 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-07-31 12:35:06 +0300 |
| commit | 48bed439024de07c8da5298aaff50110b60a85ea (patch) | |
| tree | 4e9008a8855009958c9a522c398ebd3cd0c49a1a | |
| parent | Change type of server_host column in mysql.new.sql (diff) | |
Don't render CAPTCHA whitelist when CAPTCHA is not configured
Fixes #2970
| -rw-r--r-- | src/mod_muc_room.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index ea1d3ee8d..cf4edeca2 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -3527,11 +3527,15 @@ get_config(Lang, StateData, From) -> {pubsub, Config#config.pubsub}] ++ case ejabberd_captcha:is_feature_available() of - true -> [{captcha_protected, Config#config.captcha_protected}]; - false -> [] - end ++ - [{captcha_whitelist, - lists:map(fun jid:make/1, ?SETS:to_list(Config#config.captcha_whitelist))}] + true -> + [{captcha_protected, Config#config.captcha_protected}, + {captcha_whitelist, + lists:map( + fun jid:make/1, + ?SETS:to_list(Config#config.captcha_whitelist))}]; + false -> + [] + end ++ case mod_muc_log:check_access_log(StateData#state.server_host, From) of allow -> [{enablelogging, Config#config.logging}]; |