Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-16 22:05:29 +02:00
Code Releases Activity

Fix handling of some options in old style configs

Browse Source 
This fixes issue #893.
This commit is contained in:
Paweł Chmielowski 2016-01-04 22:06:19 +01:00
parent 98bad73d56
commit da45a064a8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ejabberd_config.erl
View File

@ -425,7 +425,6 @@ merge_configs(Terms, ResMap) ->
maps:put(Name, Val, Map)
end, ResMap, Terms).
%% @doc Include additional configuration files in the list of terms.
%% @spec ([term()]) -> [term()]
include_config_files(Terms) ->
@ -443,8 +442,8 @@ include_config_files(Terms) ->
include_config_file(File, Opts)
end, lists:flatten(FileOpts)),
M1 = merge_configs(Terms1, #{}),
M2 = merge_configs(Terms2, M1),
M1 = merge_configs(transform_terms(Terms1), #{}),
M2 = merge_configs(transform_terms(Terms2), M1),
maps_to_lists(M2).
transform_include_option({include_config_file, File}) when is_list(File) ->