mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-20 17:27:00 +01:00
mod_pubsub: Fix choice of node config defaults
Ignore node plugin defaults if the plugin handling the request isn't enabled, rather than ignoring 'default_node_config' options and applying plugin defaults in that case.
This commit is contained in:
parent
ca54f81f58
commit
a9583b43c3
@ -3371,7 +3371,7 @@ node_options(Host, Type) ->
|
|||||||
case lists:member(Type, config(Host, plugins)) of
|
case lists:member(Type, config(Host, plugins)) of
|
||||||
true ->
|
true ->
|
||||||
merge_config([ConfigOpts, DefaultOpts]);
|
merge_config([ConfigOpts, DefaultOpts]);
|
||||||
false -> DefaultOpts
|
false -> ConfigOpts
|
||||||
end.
|
end.
|
||||||
|
|
||||||
-spec node_plugin_options(host(), binary()) -> [{atom(), any()}].
|
-spec node_plugin_options(host(), binary()) -> [{atom(), any()}].
|
||||||
|
Loading…
Reference in New Issue
Block a user