aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2010-06-15 22:59:53 +0200
committerBadlop <badlop@process-one.net>2010-06-15 22:59:53 +0200
commitafa0f4d40357e5412f981b0a26b0206112eb2931 (patch)
treecae7412b30a82131387648c18c9304fe1bddee27 /src
parentDiscard queued requests that are too old (the caller has already got a timeout). (diff)
Fix for Erlang R12, that doesn't support: true andalso ok
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_sm.erl12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index 446c32f48..4fc8123e7 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -573,10 +573,14 @@ route_message(From, To, Packet) ->
_ ->
case ejabberd_auth:is_user_exists(LUser, LServer) of
true ->
- is_privacy_allow(From, To, Packet) andalso
- ejabberd_hooks:run(offline_message_hook,
- LServer,
- [From, To, Packet]);
+ case is_privacy_allow(From, To, Packet) of
+ true ->
+ ejabberd_hooks:run(offline_message_hook,
+ LServer,
+ [From, To, Packet]);
+ false ->
+ ok
+ end;
_ ->
Err = jlib:make_error_reply(
Packet, ?ERR_SERVICE_UNAVAILABLE),