aboutsummaryrefslogtreecommitdiff
path: root/src/mod_pubsub/mod_pubsub.erl
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2008-10-16 23:09:51 +0000
committerChristophe Romain <christophe.romain@process-one.net>2008-10-16 23:09:51 +0000
commit0083e56c22317c457179ea0c6c0acb3ca73e3f1b (patch)
treec16e7e8b882b8880cb1a1ef7a327ba059c32fa5e /src/mod_pubsub/mod_pubsub.erl
parentfix badarg issue on get_roster_info when allowed roster groups is not defined (diff)
fix remove_user not unsubscribing user (EJAB-684)
SVN Revision: 1659
Diffstat (limited to 'src/mod_pubsub/mod_pubsub.erl')
-rw-r--r--src/mod_pubsub/mod_pubsub.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index aa395743a..24f39c9f2 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -518,8 +518,9 @@ handle_cast({presence, JID, Pid}, State) ->
end,
{noreply, State};
-handle_cast({remove_user, User, Host}, State) ->
- Owner = jlib:make_jid(User, Host, ""),
+handle_cast({remove_user, LUser, LServer}, State) ->
+ Host = State#state.host,
+ Owner = jlib:make_jid(LUser, LServer, ""),
OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)),
%% remove user's subscriptions
lists:foreach(fun(Type) ->
@@ -537,7 +538,7 @@ handle_cast({remove_user, User, Host}, State) ->
delete_node(NodeKey, NodeName, Owner)
end, tree_action(Host, get_nodes, [OwnerKey])),
%% remove user's nodes
- delete_node(Host, ["home", Host, User], Owner),
+ delete_node(Host, ["home", LServer, LUser], Owner),
{noreply, State};
handle_cast(_Msg, State) ->