Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Merge pull request #1548 from lemenkov/use_get_option

Browse Source 
Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2
This commit is contained in:
Evgeny Khramtsov 2017-02-16 23:34:50 +04:00 committed by GitHub
commit ae25fa994c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_auth_external.erl
View File

@ -315,7 +315,7 @@ get_mod_last_configured(Server) ->
end. end.
is_configured(Host, Module) -> is_configured(Host, Module) ->
Os = ejabberd_config:get_local_option({modules, Host}, Os = ejabberd_config:get_option({modules, Host},
fun(M) when is_list(M) -> M end), fun(M) when is_list(M) -> M end),
lists:keymember(Module, 1, Os). lists:keymember(Module, 1, Os).

2
src/ejabberd_auth_riak.erl
View File

@ -270,7 +270,7 @@ remove_user(User, Server, Password) ->
is_scrammed() -> is_scrammed() ->
scram == scram ==
ejabberd_config:get_local_option({auth_password_format, ?MYNAME}, ejabberd_config:get_option({auth_password_format, ?MYNAME},
fun(V) -> V end). fun(V) -> V end).
password_to_scram(Password) -> password_to_scram(Password) ->

2
src/ejabberd_commands.erl
View File

@ -332,7 +332,7 @@ expose_commands(Commands) ->
end, end,
Commands), Commands),
case ejabberd_config:add_local_option(commands, [{add_commands, Names}]) of case ejabberd_config:add_option(commands, [{add_commands, Names}]) of
{aborted, Reason} -> {aborted, Reason} ->
{error, Reason}; {error, Reason};
{atomic, Result} -> {atomic, Result} ->