diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2016-01-05 00:06:19 +0300 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2016-01-05 00:06:19 +0300 |
| commit | da45a064a8a2e70ce35163182d9eaf8000b56f70 (patch) | |
| tree | ecd0338aa56849e1cc16d1cf2b132ecc2f18781d /src | |
| parent | 98bad73d562f202c606f1aa8e51e1c2756cba15f (diff) | |
Fix handling of some options in old style configs
This fixes issue #893.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_config.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 75d56509e..6e2cabb57 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -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) -> |