allow owner to subscribe/get its one node (EJAB-705)

SVN Revision: 1485

diff --git a/ChangeLog b/ChangeLog
index 25bb1fa58b4131e5603e664e22d00631ea1fb389..2909ae88d2ff6f33baa617ec4ca83852c7956183 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-23  Christophe Romain  <christophe.romain@process-one.net>
+
+       * src/mod_pubsub/mod_pubsub.erl: Allow owner to subscribe/get its own
+       node (EJAB-705)
+
 2008-07-24  Badlop  <badlop@process-one.net>
 
        * 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 d9ad7a105e64d607526ee4d09a05430bfe737797..fc4df8fe589f58ba7659c65def55c1893601fe61 100644 (file)
--- 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),