Fix service disco handling for bare account JIDs

Don't swap the sending and receiving JIDs while checking whether the
client that requested service discovery information for a bare account
JID is a subscribed contact.

diff --git a/src/mod_disco.erl b/src/mod_disco.erl
index 40f0f8e06017f897cfdae98311884ca8ca7e89e8..4231df68df127f8aa8689ba30e84a00827732ed4 100644 (file)
--- a/src/mod_disco.erl
+++ b/src/mod_disco.erl
@@ -357,13 +357,13 @@ is_presence_subscribed(#jid{luser = User,
                       #jid{luser = LUser, lserver = LServer}) ->
     lists:any(fun (#roster{jid = {TUser, TServer, _},
                           subscription = S}) ->
-                     if LUser == TUser, LServer == TServer, S /= none ->
+                     if User == TUser, Server == TServer, S /= none ->
                             true;
                         true -> false
                      end
              end,
-             ejabberd_hooks:run_fold(roster_get, Server, [],
-                                     [{User, Server}]))
+             ejabberd_hooks:run_fold(roster_get, LServer, [],
+                                     [{LUser, LServer}]))
       orelse User == LUser andalso Server == LServer.
 
 process_sm_iq_info(From, To,