bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

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

Browse source 
Add check for relationship with remote user for connect display
This commit is contained in:
Michael Vogel 2018-12-13 22:18:24 +01:00 committed by GitHub
parent f6917dd8f4 7c11194a2c
commit e2f1fd1efb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Model/Profile.php
View file

@ -99,7 +99,7 @@ class Profile
* load a lot of theme-specific content * load a lot of theme-specific content
* *
* @brief Loads a profile into the page sidebar. * @brief Loads a profile into the page sidebar.
* @param object $a App * @param App $a
* @param string $nickname string * @param string $nickname string
* @param int $profile int * @param int $profile int
* @param array $profiledata array * @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'])) { if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) {
$connect = false; $connect = false;
} }