Merge pull request #2117 from annando/1511-feed-remote

Bugfix: Only show the feed link for local profiles

diff --git a/include/identity.php b/include/identity.php
index 0282b2d9a51a1a14ff4bb0c417714ff071a41317..48fd5056dc98a10a85b3c97ad1156d956b8fa988 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -218,15 +218,15 @@ if(! function_exists('profile_sidebar')) {
                if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
                        $connect = false;
 
-               if ($connect)
+               if (isset($profile['remoteconnect']))
+                       $remoteconnect = $profile['remoteconnect'];
+
+               if ($connect AND ($profile['network'] == NETWORK_DFRN) AND !isset($remoteconnect))
                        $subscribe_feed = t("Atom feed");
                else
                        $subscribe_feed = false;
 
-               if (isset($profile['remoteconnect']))
-                       $remoteconnect = $profile['remoteconnect'];
-
-               if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) )
+               if(get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))
                        $wallmessage = t('Message');
                else
                        $wallmessage = false;