Merge pull request #2126 from annando/1511-duplicates

[friendica.git] / include / identity.php

diff --git a/include/identity.php b/include/identity.php
index 0282b2d9a51a1a14ff4bb0c417714ff071a41317..1cd2e6f73ace74f81a350e38999e742f24b86c73 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;
@@ -700,6 +700,16 @@ if(! function_exists('profile_tabs')){
                        );
                }
 
+               if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) {
+                       $tabs[] = array(
+                               'label' => t('Contacts'),
+                               'url'   => $a->get_baseurl() . '/viewcontacts/' . $nickname,
+                               'sel'   => ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
+                               'title' => t('Contacts'),
+                               'id' => 'viewcontacts-tab',
+                               'accesskey' => 'k',
+                       );
+               }
 
                $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
                call_hooks('profile_tabs', $arr);