summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2008-07-24 14:07:05 +0000
committerChristophe Romain <christophe.romain@process-one.net>2008-07-24 14:07:05 +0000
commit55cfcafd9253216465e3b05f58a7db6a42a66d62 (patch)
tree5e639f81b01ee4e02b20521ec0e1bcbe63e924ad /src
parent* doc/guide.tex: Document room options allow_visitor_nickchange (diff)
allow owner to subscribe/get its one node (EJAB-705)
SVN Revision: 1486
Diffstat (limited to 'src')
-rw-r--r--src/mod_pubsub/mod_pubsub.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 82a2c483..5df46172 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),