Merge pull request #2151 from annando/1512-misconfigured-friendica

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index f6174da66cd919d9c6e02effda70bf438e973e2e..3b0367b4290e1efd02ccbd945eca34fb4e79bb4d 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -19,8 +19,8 @@ function match_content(&$a) {
        if(! local_user())
                return;
 
-       $a->page['aside'] .= follow_widget();
        $a->page['aside'] .= findpeople_widget();
+       $a->page['aside'] .= follow_widget();
 
        $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
@@ -70,9 +70,16 @@ function match_content(&$a) {
                                        $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
                                        $photo_menu[] = array(t("Connect/Follow"), $connlnk);
 
+                                       $contact_details = get_contact_details_by_url($jj->url, local_user());
+
                                        $entry = array(
                                                'url' => zrl($jj->url),
+                                               'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
                                                'name' => $jj->name,
+                                               'details'       => $contact_details['location'],
+                                               'tags'          => $contact_details['keywords'],
+                                               'about'         => $contact_details['about'],
+                                               'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
                                                'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
                                                'inttxt' => ' ' . t('is interested in:'),
                                                'conntxt' => t('Connect'),
@@ -81,8 +88,8 @@ function match_content(&$a) {
                                                'photo_menu' => $photo_menu,
                                                'id' => ++$id,
                                        );
+                                       $entries[] = $entry;
                                }
-                               $entries[] = $entry;
                        }
 
                $tpl = get_markup_template('viewcontact_template.tpl');