From cc07020d34839cbf446636d57d892cea62fc5e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?= Date: Tue, 28 Nov 2006 09:59:29 +0000 Subject: [PATCH] * src/ejabberd_c2s.erl: User login in with negative priority must not receive offline messages (Thanks to Badlop) (EJAB-158). SVN Revision: 683 --- ChangeLog | 5 +++++ src/ejabberd_c2s.erl | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5e7c0fbb..305b32d87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-28 Mickael Remond + + * src/ejabberd_c2s.erl: User login in with negative priority must not + receive offline messages (Thanks to Badlop). + 2006-11-24 Mickael Remond * doc/guide.tex: Fixed regexp ACL configuration examples diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index db0755c54..9adbce5c9 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1337,8 +1337,12 @@ presence_update(From, Packet, StateData) -> ejabberd_hooks:run(user_available_hook, StateData#state.server, [StateData#state.jid]), - resend_offline_messages(StateData), - resend_subscription_requests(StateData), + if NewPriority >= 0 -> + resend_offline_messages(StateData), + resend_subscription_requests(StateData); + true -> + ok + end, presence_broadcast_first( From, StateData#state{pres_last = Packet, pres_invis = false