Fix handling of some options in old style configs

This fixes issue #893.

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 75d56509ec47fee5a1eb60a6a78e2125c40d9bab..6e2cabb5770ff1f476d77f71383afbca29df82f5 100644 (file)
--- 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) ->