Merge pull request #146 from tobiasd/master

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 2742b4a887844fd14ba6c4eb3774cf1d18b82721..5dd80fe3efad761e90757e6e34ef31595e076d5d 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -15,7 +15,7 @@ function match_content(&$a) {
        if(! count($r))
                return; 
        if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
-               notice('No keywords to match. Please add keywords to your default profile.');
+               notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
                return;
 
        }
@@ -26,8 +26,11 @@ function match_content(&$a) {
                $params['s'] = $tags;
                if($a->pager['page'] != 1)
                        $params['p'] = $a->pager['page'];
-
-               $x = post_url('http://dir.friendika.com/msearch', $params);
+                       
+               if(strlen(get_config('system','directory_submit_url')))
+                       $x = post_url('http://dir.friendika.com/msearch', $params);
+               else
+                       $x = post_url($a->get_baseurl() . '/msearch', $params);
 
                $j = json_decode($x);
 
@@ -38,8 +41,9 @@ function match_content(&$a) {
 
                if(count($j->results)) {
                        foreach($j->results as $jj) {
+
                                $o .= '<div class="profile-match-wrapper"><div class="profile-match-photo">';
-                               $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" title="' . $jj->name . '[' . $jj->url . ']' . '" /></a></div>';
+                               $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" title="' . $jj->name . '[' . $jj->tags . ']' . '" /></a></div>';
                                $o .= '<div class="profile-match-break"></div>';
                                $o .= '<div class="profile-match-name"><a href="' . $jj->url . '" title="' . $jj->name . '[' . $jj->url .']' . '">' . $jj->name . '</a></div>';
                                $o .= '<div class="profile-match-end"></div></div>';