mirror of
https://github.com/processone/ejabberd.git
synced 2025-01-03 18:02:28 +01:00
pubsub disco_sm_items bugfix
SVN Revision: 1051
This commit is contained in:
parent
d788bd1a27
commit
23b91e953a
@ -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
|
||||
|
@ -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,8 +2705,7 @@ 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
|
||||
Module = case ets:lookup(gen_mod:get_module_proc(Host, pubsub_state), nodetree) of
|
||||
[{nodetree, N}] -> N;
|
||||
_ -> list_to_atom(?TREE_PREFIX ++ ?STDNODE)
|
||||
end,
|
||||
|
Loading…
Reference in New Issue
Block a user