Merge pull request #2110 from annando/1511-subscribe-feed

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 934472b39ff9c4172db531056b1d8ce551efdbef..1dc886363ae1ddf699f4aa41a19a6a4d6c799e9f 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -55,7 +55,7 @@ function contacts_init(&$a) {
                $findpeople_widget .= findpeople_widget();
        }
 
-       $groups_widget .= group_side('contacts','group',false,0,$contact_id);
+       $groups_widget .= group_side('contacts','group','full',0,$contact_id);
        
        $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
                '$vcard_widget' => $vcard_widget,
@@ -867,7 +867,7 @@ function _contact_detail_for_template($rr){
                'name' => htmlentities($rr['name']),
                'username' => htmlentities($rr['name']),
                'sparkle' => $sparkle,
-               'itemurl' => $rr['url'],
+               'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
                'url' => $url,
                'network' => network_to_name($rr['network'], $rr['url']),
        );