diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2016-05-25 09:19:29 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2016-05-26 11:08:53 +0200 |
| commit | c55319c81e1087126889d70d5962baa24dd7debf (patch) | |
| tree | 46d127b23f898a0b144e16232792cf7ab0e9c762 /src/ejabberd_config.erl | |
| parent | Copy lite.sql to place where tests expect it in failback mode (diff) | |
Do not call transform_terms multiple times on configs when merging them
Diffstat (limited to 'src/ejabberd_config.erl')
| -rw-r--r-- | src/ejabberd_config.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 16eebc0e..8c17e577 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -498,8 +498,8 @@ include_config_files(Terms) -> include_config_file(File, Opts) end, lists:flatten(FileOpts)), - M1 = merge_configs(transform_terms(Terms1), #{}), - M2 = merge_configs(transform_terms(Terms2), M1), + M1 = merge_configs(Terms1, #{}), + M2 = merge_configs(Terms2, M1), maps_to_lists(M2). transform_include_option({include_config_file, File}) when is_list(File) -> |