24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-10 21:47:01 +02:00

Check option of the nodetree instead of checking configuration

SVN Revision: 1737
This commit is contained in:
Christophe Romain 2008-12-18 13:45:46 +00:00
parent 8f43867091
commit c0fb556a01
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2008-12-18 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: Check option of the nodetree instead
of checking configuration (thanks to Eric Cestari)(EJAB-737)
2008-12-16 Badlop <badlop@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: Fix update pubsub tables from

View File

@ -1254,8 +1254,8 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) ->
ok ->
node_call(Type, create_node, [Host, Node, Owner]);
{error, ?ERR_CONFLICT} ->
case ets:lookup(gen_mod:get_module_proc(ServerHost, pubsub_state), nodetree) of
[{nodetree, nodetree_virtual}] -> node_call(Type, create_node, [Host, Node, Owner]);
case proplists:get_value(virtual_tree, tree_call(Host, options, [])) of
true -> node_call(Type, create_node, [Host, Node, Owner]);
_ -> {error, ?ERR_CONFLICT}
end;
Error ->