diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2015-05-25 15:23:38 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2015-05-25 15:37:46 +0200 |
| commit | 3af507cc43eadbfdae3347f0c755b7594c3efd81 (patch) | |
| tree | 28a8e1cc49f5e2483226f6efe8a74c01e02988c7 /src | |
| parent | Fix use of publish_only affiliation with odbc backend (diff) | |
Fix merging of not yaml config files
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_config.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 4931fe72e..fb5063775 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -391,7 +391,9 @@ include_config_files(Terms) -> dict:store(Name, Val, Dict); _ -> dict:update(rest, fun(L1) -> [Pair|L1] end, Dict) - end + end; + (Tuple, Dict2) -> + dict:update(rest, fun(L2) -> [Tuple|L2] end, Dict2) end, dict:from_list([{rest, []}]), L) end, |