Merge pull request #2135 from rabuzarus/doxygen

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 60a4a450b212f66336956905ac833b83a1a8c62e..08609222972e68dfcd832647f2709d2fbe619967 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -70,7 +70,7 @@ function common_content(&$a) {
 
 
        if($cid == 0 && $zcid == 0)
-               return; 
+               return;
 
 
        if($cid)
@@ -101,18 +101,18 @@ function common_content(&$a) {
 
        foreach($r as $rr) {
 
+               //get further details of the contact
+               $contact_details = get_contact_details_by_url($rr['url'], $uid);
+
                // $rr[id] is needed to use contact_photo_menu()
                $rr[id] = $rr[cid];
 
                $photo_menu = '';
                $photo_menu = contact_photo_menu ($rr);
 
-               //get further details of the contact
-               $contact_details = get_contact_details_by_url($rr['url'], $uid);
-
                $entry = array(
                        'url'           => $rr['url'],
-                       'itemurl'       => $rr['url'],
+                       'itemurl'       => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
                        'name'          => $rr['name'],
                        'thumb'         => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
                        'img_hover'     => htmlentities($rr['name']),