summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaweł Chmielowski <prefiks@prefiks.org>2016-03-16 11:37:25 +0100
committerPaweł Chmielowski <prefiks@prefiks.org>2016-03-16 11:37:25 +0100
commit34bc698526feb0ccd61adbbd867a8aee57eb1d2c (patch)
treebdd4ad45498a7ef955b78ff01637a79088a5fdc3 /src
parentMake auto generated resources shorter (diff)
parentBare JID in 'from' of Roster Push (RFC 6121 section 2.1.6) in mod_admin_extra (diff)
Merge pull request #1011 from oxoWrk/master
Bare JID in 'from' of Roster Push (RFC 6121 section 2.1.6) in mod_adm…
Diffstat (limited to 'src')
-rw-r--r--src/mod_admin_extra.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
index ad3f10ab..b8ee49f7 100644
--- a/src/mod_admin_extra.erl
+++ b/src/mod_admin_extra.erl
@@ -1194,7 +1194,7 @@ push_roster_item(LU, LS, R, U, S, Action) ->
ejabberd_sm:route(LJID, LJID, BroadcastEl),
Item = build_roster_item(U, S, Action),
ResIQ = build_iq_roster_push(Item),
- ejabberd_router:route(LJID, LJID, ResIQ).
+ ejabberd_router:route(jlib:jid_remove_resource(LJID), LJID, ResIQ).
build_roster_item(U, S, {add, Nick, Subs, Group}) ->
{xmlel, <<"item">>,