diff options
| author | Christophe Romain <chris.romain@gmail.com> | 2010-06-02 16:46:02 +0200 |
|---|---|---|
| committer | Christophe Romain <chris.romain@gmail.com> | 2010-06-02 16:46:02 +0200 |
| commit | c544384c837ad5c2df6d4ba8b716deadc1126d51 (patch) | |
| tree | f144fb539754129794ca170280b95857ab59374e /src/mod_pubsub | |
| parent | final fix on created node notification (EJAB-1225) (diff) | |
sync last changes in pubsub_odbc patch
Diffstat (limited to 'src/mod_pubsub')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub_odbc.erl | 6 | ||||
| -rw-r--r-- | src/mod_pubsub/pubsub_odbc.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl index 058eb71a5..6150141e7 100644 --- a/src/mod_pubsub/mod_pubsub_odbc.erl +++ b/src/mod_pubsub/mod_pubsub_odbc.erl @@ -1544,17 +1544,17 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) -> end, case node_call(Type, create_node_permission, [Host, ServerHost, Node, Parent, Owner, Access]) of {result, true} -> - ParentTree = tree_call(Host, get_parentnodes_tree, [Host, Node, Owner]), - SubsByDepth = [{Depth, [{N, get_node_subs(N)} || N <- Nodes]} || {Depth, Nodes} <- ParentTree], case tree_call(Host, create_node, [Host, Node, Type, Owner, NodeOptions, Parents]) of {ok, NodeId} -> + ParentTree = tree_call(Host, get_parentnodes_tree, [Host, Node, Owner]), + SubsByDepth = [{Depth, [{N, get_node_subs(N)} || N <- Nodes]} || {Depth, Nodes} <- ParentTree], case node_call(Type, create_node, [NodeId, Owner]) of {result, Result} -> {result, {NodeId, SubsByDepth, Result}}; Error -> Error end; {error, {virtual, NodeId}} -> case node_call(Type, create_node, [NodeId, Owner]) of - {result, Result} -> {result, {NodeId, SubsByDepth, Result}}; + {result, Result} -> {result, {NodeId, [], Result}}; Error -> Error end; Error -> diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch index 1a5b9dd92..6dfc8b628 100644 --- a/src/mod_pubsub/pubsub_odbc.patch +++ b/src/mod_pubsub/pubsub_odbc.patch @@ -1,5 +1,5 @@ ---- mod_pubsub.erl 2010-05-28 13:32:18.000000000 +0200 -+++ mod_pubsub_odbc.erl 2010-05-28 13:33:37.000000000 +0200 +--- mod_pubsub.erl 2010-06-02 15:03:48.000000000 +0200 ++++ mod_pubsub_odbc.erl 2010-06-02 16:45:38.000000000 +0200 @@ -42,7 +42,7 @@ %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% XEP-0060 section 12.18. |