aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2016-04-21 11:15:53 +0200
committerPaweł Chmielowski <pchmielowski@process-one.net>2016-04-21 11:16:36 +0200
commit97e3a33077bb5839397feeebaed8c779c4309163 (patch)
treef64eb080e499169dc0ad0e13ef832c32fd340e06
parentRename odbc to sql everywhere (diff)
Accept commands: add_commands syntax (along commands: - add_commands)
-rw-r--r--src/ejabberd_commands.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ejabberd_commands.erl b/src/ejabberd_commands.erl
index dd14748d0..55ecba5d1 100644
--- a/src/ejabberd_commands.erl
+++ b/src/ejabberd_commands.erl
@@ -703,10 +703,11 @@ get_access_commands(AccessCommands, _Version) ->
get_commands() ->
get_commands(?DEFAULT_VERSION).
get_commands(Version) ->
- Opts = ejabberd_config:get_option(
+ Opts0 = ejabberd_config:get_option(
commands,
fun(V) when is_list(V) -> V end,
[]),
+ Opts = lists:map(fun(V) when is_tuple(V) -> [V]; (V) -> V end, Opts0),
CommandsList = list_commands_policy(Version),
OpenCmds = [N || {N, _, _, open} <- CommandsList],
RestrictedCmds = [N || {N, _, _, restricted} <- CommandsList],