From cc07020d34839cbf446636d57d892cea62fc5e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Tue, 28 Nov 2006 09:59:29 +0000
Subject: * src/ejabberd_c2s.erl: User login in with negative priority must not
 receive offline messages (Thanks to Badlop) (EJAB-158).

SVN Revision: 683
---
 src/ejabberd_c2s.erl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3