From afa0f4d40357e5412f981b0a26b0206112eb2931 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 15 Jun 2010 22:59:53 +0200
Subject: Fix for Erlang R12, that doesn't support: true andalso ok

---
 src/ejabberd_sm.erl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

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