From: Christophe Romain Date: Thu, 24 Jul 2008 14:06:28 +0000 (+0000) Subject: allow owner to subscribe/get its one node (EJAB-705) X-Git-Tag: v2.0.2~34 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71e87aef6eb4f6683169bfcf241bcfa21c0b3325;p=ejabberd allow owner to subscribe/get its one node (EJAB-705) SVN Revision: 1485 --- diff --git a/ChangeLog b/ChangeLog index 25bb1fa58..2909ae88d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-23 Christophe Romain + + * src/mod_pubsub/mod_pubsub.erl: Allow owner to subscribe/get its own + node (EJAB-705) + 2008-07-24 Badlop * src/Makefile.in: Support for parallel compilation with 'make -j' diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index d9ad7a105..fc4df8fe5 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -2013,7 +2013,8 @@ get_roster_info(OwnerUser, OwnerServer, {SubscriberUser, SubscriberServer, _}, A roster_get_jid_info, OwnerServer, {none, []}, [OwnerUser, OwnerServer, {SubscriberUser, SubscriberServer, ""}]), - PresenceSubscription = (Subscription == both) orelse (Subscription == from), + PresenceSubscription = (Subscription == both) orelse (Subscription == from) + orelse ({OwnerUser, OwnerServer} == {SubscriberUser, SubscriberServer}), RosterGroup = lists:any(fun(Group) -> lists:member(Group, AllowedGroups) end, Groups),