diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 11 |
2 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,8 @@ + +2007-12-06 Christophe Romain <christophe.romain@process-one.net> + + * src/mod_pubsub/mod_pubsub.erl: disco_sm_items bugfix + 2007-12-07 Alexey Shchepin <alexey@process-one.net> * src/ejabberd_sm.erl: Bugfix diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 25a225487..88ccc8d3d 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -347,7 +347,7 @@ disco_sm_items(Acc, _From, To, Node, _Lang) -> %% TODO, use iq_disco_items(Host, Node, From) Host = To#jid.lserver, LJID = jlib:jid_tolower(jlib:jid_remove_resource(To)), - case tree_action(Host, get_items, [Host, Node]) of + case get_items(Host, Node) of [] -> Acc; AllItems -> @@ -2705,11 +2705,10 @@ features(Host, Node) -> tree_call({_User, Server, _Resource}, Function, Args) -> tree_call(Server, Function, Args); tree_call(Host, Function, Args) -> - Module = case ets:lookup(gen_mod:get_module_proc(Host, pubsub_state), - nodetree) of - [{nodetree, N}] -> N; - _ -> list_to_atom(?TREE_PREFIX ++ ?STDNODE) - end, + Module = case ets:lookup(gen_mod:get_module_proc(Host, pubsub_state), nodetree) of + [{nodetree, N}] -> N; + _ -> list_to_atom(?TREE_PREFIX ++ ?STDNODE) + end, catch apply(Module, Function, Args). tree_action(Host, Function, Args) -> Fun = fun() -> tree_call(Host, Function, Args) end, |