From 38ad132ba226ee0984fb8a22186f35808f52d30b Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Fri, 24 Aug 2007 03:54:42 +0000 Subject: [PATCH] * src/ejabberd_sm.erl: Removed check which denies resource to receive its own presence SVN Revision: 885 --- ChangeLog | 3 +++ src/ejabberd_sm.erl | 14 ++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e35ca525c..97c7ebe0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-08-23 Alexey Shchepin + * src/ejabberd_sm.erl: Removed check which denies resource to + receive its own presence + * src/web/ejabberd_web_admin.erl: Added hooks to allow plugins to add their pages without modifying ejabberd_web_admin.erl (thanks to Badlop) diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 91be5d97a..d7d573d6b 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -3,7 +3,6 @@ %%% Author : Alexey Shchepin %%% Purpose : Session manager %%% Created : 24 Nov 2002 by Alexey Shchepin -%%% Id : $Id$ %%%---------------------------------------------------------------------- -module(ejabberd_sm). @@ -374,15 +373,10 @@ do_route(From, To, Packet) -> LUser, LServer), lists:foreach( fun({_, R}) -> - if LFrom /= - {LUser, LServer, R} -> - do_route( - From, - jlib:jid_replace_resource(To, R), - Packet); - true -> - ok - end + do_route( + From, + jlib:jid_replace_resource(To, R), + Packet) end, PResources); true -> ok