diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2009-08-27 22:36:46 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2009-08-27 22:36:46 +0000 |
| commit | 5e99d3416db74bbbd74bfdb930705d1834e6694e (patch) | |
| tree | c50f719b00e6d897f7fa6cca4da4538c76b3ca2e /src/mod_pubsub/mod_pubsub.erl | |
| parent | remove INFO_MSG call inside sql_query_internal (diff) | |
delete node fix
SVN Revision: 2558
Diffstat (limited to 'src/mod_pubsub/mod_pubsub.erl')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index b4c49741f..de279a1a6 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -1758,13 +1758,10 @@ delete_node(_Host, [], _Owner) -> {error, ?ERR_NOT_ALLOWED}; delete_node(Host, Node, Owner) -> Action = fun(#pubsub_node{type = Type, id = NodeId}) -> - SubsByDepth = get_collection_subscriptions(Host, Node), case node_call(Type, get_affiliation, [NodeId, Owner]) of {result, owner} -> - SubsByDepth = case tree_call(Host, get_parentnodes_tree, [Host, Node, service_jid(Host)]) of - {result, T} -> [{Depth, [{N, get_node_subs(N)} || N <- Nodes]} || {Depth, Nodes} <- T]; - _ -> [] - end, + ParentTree = tree_call(Host, get_parentnodes_tree, [Host, Node, service_jid(Host)]), + SubsByDepth = [{Depth, [{N, get_node_subs(N)} || N <- Nodes]} || {Depth, Nodes} <- ParentTree], Removed = tree_call(Host, delete_node, [Host, Node]), case node_call(Type, delete_node, [Removed]) of {result, Res} -> {result, {SubsByDepth, Res}}; |