From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Wed, 31 Jul 2019 09:35:06 +0000 (+0300)
Subject: Don't render CAPTCHA whitelist when CAPTCHA is not configured
X-Git-Tag: 19.08~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48bed439024de07c8da5298aaff50110b60a85ea;p=ejabberd

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 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}];