aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/ejabberd_c2s.erl8
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 <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