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

sync last changes in pubsub_odbc patch

Browse Source
This commit is contained in:
Christophe Romain 2010-06-02 16:47:03 +02:00
parent 2187bccc38
commit 2f372261d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -1619,17 +1619,17 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) ->
end, end,
case node_call(Type, create_node_permission, [Host, ServerHost, Node, Parent, Owner, Access]) of case node_call(Type, create_node_permission, [Host, ServerHost, Node, Parent, Owner, Access]) of
{result, true} -> {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 case tree_call(Host, create_node, [Host, Node, Type, Owner, NodeOptions, Parents]) of
{ok, NodeId} -> {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 case node_call(Type, create_node, [NodeId, Owner]) of
{result, Result} -> {result, {NodeId, SubsByDepth, Result}}; {result, Result} -> {result, {NodeId, SubsByDepth, Result}};
Error -> Error Error -> Error
end; end;
{error, {virtual, NodeId}} -> {error, {virtual, NodeId}} ->
case node_call(Type, create_node, [NodeId, Owner]) of case node_call(Type, create_node, [NodeId, Owner]) of
{result, Result} -> {result, {NodeId, SubsByDepth, Result}}; {result, Result} -> {result, {NodeId, [], Result}};
Error -> Error Error -> Error
end; end;
Error -> Error ->

4
src/mod_pubsub/pubsub_odbc.patch
View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2010-05-28 13:26:20.000000000 +0200 --- mod_pubsub.erl 2010-06-02 16:46:29.000000000 +0200
+++ mod_pubsub_odbc.erl 2010-05-28 13:26:29.000000000 +0200 +++ mod_pubsub_odbc.erl 2010-06-02 16:46:33.000000000 +0200
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
%%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
%%% XEP-0060 section 12.18. %%% XEP-0060 section 12.18.