aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2010-04-27 13:30:00 +0200
committerBadlop <badlop@process-one.net>2010-04-27 13:30:00 +0200
commit6ae1f6246954fb9dd0333fea845f2a7b1fe2eca2 (patch)
tree9bfec9b106296d7ce24bb6eb89e22cd643b2d419 /src
parentAutomatic vcard avatar addition in presence (thanks to Igor Goryachev)(EJAB-208) (diff)
Don't store blocked messages in offline queue (thanks to Brian Acton)(EJAB-1224)
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_sm.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index 782732603..446c32f48 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -573,9 +573,10 @@ route_message(From, To, Packet) ->
_ ->
case ejabberd_auth:is_user_exists(LUser, LServer) of
true ->
- ejabberd_hooks:run(offline_message_hook,
- LServer,
- [From, To, Packet]);
+ is_privacy_allow(From, To, Packet) andalso
+ ejabberd_hooks:run(offline_message_hook,
+ LServer,
+ [From, To, Packet]);
_ ->
Err = jlib:make_error_reply(
Packet, ?ERR_SERVICE_UNAVAILABLE),