Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote

Add check for relationship with remote user for connect display

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index a73c841..0ebdcec 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -99,7 +99,7 @@ class Profile
         *      load a lot of theme-specific content
         *
         * @brief Loads a profile into the page sidebar.
-        * @param object  $a            App
+        * @param App     $a
         * @param string  $nickname     string
         * @param int     $profile      int
         * @param array   $profiledata  array
@@ -337,6 +337,11 @@ class Profile
                        }
                }
 
+               // Is the remote user already connected to that user?
+               if ($connect && Contact::isFollower(remote_user(), $profile['uid'])) {
+                       $connect = false;
+               }
+
                if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) {
                        $connect = false;
                }