Check option of the nodetree instead of checking configuration

SVN Revision: 1737

diff --git a/ChangeLog b/ChangeLog
index 00d5dfa0ecdaa17974865f088a280012a0a4aa12..b8172320fecc8df2dbd3afb55a2202084cfac1bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 61002daecbbcc340831f2dbf55f937c19241d132..748355bdfe1cd9141ccd291faa1eae240e406d25 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -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 ->