Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Check option of the nodetree instead of checking configuration

Browse Source 
SVN Revision: 1738
This commit is contained in:
Christophe Romain 2008-12-18 13:46:30 +00:00
parent d3ddf10839
commit e6535dcc67
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
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-17 Pablo Polvorin <pablo.polvorin@process-one.net> 2008-12-17 Pablo Polvorin <pablo.polvorin@process-one.net>
* src/mod_muc/mod_muc_room.erl: Fix bug in MUC invite. * src/mod_muc/mod_muc_room.erl: Fix bug in MUC invite.

4
src/mod_pubsub/mod_pubsub.erl
View File

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