Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index b73c2cd1b61eef34a248ff9e507d92b4182f419b..00033b2d246feba8b84f961dc4edf4a8587844aa 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -78,17 +78,20 @@ function suggest_content(&$a) {
 
                $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
                $ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
-               $photo_menu = array(array(t("View Profile"), zrl($rr["url"])));
-               $photo_menu[] = array(t("Connect/Follow"), $connlnk);
-               $photo_menu[] = array(t('Ignore/Hide'), $ignlnk);
-               $contact_details = get_contact_details_by_url($rr["url"], local_user());
+               $photo_menu = array(
+                       'profile' => array(t("View Profile"), zrl($rr["url"])),
+                       'follow' => array(t("Connect/Follow"), $connlnk),
+                       'hide' => array(t('Ignore/Hide'), $ignlnk)
+               );
+
+               $contact_details = get_contact_details_by_url($rr["url"], local_user(), $rr);
 
                $entry = array(
                        'url' => zrl($rr['url']),
                        'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
                        'img_hover' => $rr['url'],
-                       'name' => $rr['name'],
-                       'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+                       'name' => $contact_details['name'],
+                       'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
                        'details'       => $contact_details['location'],
                        'tags'          => $contact_details['keywords'],
                        'about'         => $contact_details['about'],