Don't render CAPTCHA whitelist when CAPTCHA is not configured

Fixes #2970

diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index ea1d3ee8d98fb077257dad2f6e7714689a7da24c..cf4edeca2568d2d19b7377dcb1d0ac5bec69728f 100644 (file)
--- 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}];