diff options
| author | Mickaël Rémond <mickael.remond@process-one.net> | 2006-11-28 09:59:29 +0000 |
|---|---|---|
| committer | Mickaël Rémond <mickael.remond@process-one.net> | 2006-11-28 09:59:29 +0000 |
| commit | cc07020d34839cbf446636d57d892cea62fc5e2b (patch) | |
| tree | b30597f4ef764c31d1ea2b312b7878183bba4a4e | |
| parent | * src/muc/mod_muc_room.erl: API improvement. It is now possible (diff) | |
* src/ejabberd_c2s.erl: User login in with negative priority must not
receive offline messages (Thanks to Badlop) (EJAB-158).
SVN Revision: 683
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-11-28 Mickael Remond <mickael.remond@process-one.net> + + * src/ejabberd_c2s.erl: User login in with negative priority must not + receive offline messages (Thanks to Badlop). + 2006-11-24 Mickael Remond <mickael.remond@process-one.net> * 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 |