From: Christophe Romain <christophe.romain@process-one.net>
Date: Thu, 24 Jul 2008 14:07:05 +0000 (+0000)
Subject: allow owner to subscribe/get its one node (EJAB-705)
X-Git-Tag: v2.1.0~18^2~633
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55cfcafd9253216465e3b05f58a7db6a42a66d62;p=ejabberd

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

SVN Revision: 1486
---

diff --git a/ChangeLog b/ChangeLog
index 49c6cb519..af7c9e5c2 100644
--- 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>
 
 	* doc/guide.tex: Document room options allow_visitor_nickchange
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 82a2c483f..5df46172d 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),