From e6aaa8b59b138f4195fb7f1e93b9b14980c309c3 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 2 Jul 2011 01:21:56 -0700
Subject: use local 'match people with my interests' if global directory is not
 configured

---
 mod/match.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mod/match.php')

diff --git a/mod/match.php b/mod/match.php
index 2d6456b54..4316d8bd7 100644
--- 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;
 
 	}
@@ -27,7 +27,10 @@ function match_content(&$a) {
 		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);
 
-- 
cgit v1.2.3


From e795d1265e9d49439e4af66184d50f6affe079c6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 3 Jul 2011 21:30:48 -0700
Subject: show keywords in match results

---
 mod/match.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/match.php')

diff --git a/mod/match.php b/mod/match.php
index 4316d8bd7..5dd80fe3e 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -43,7 +43,7 @@ function match_content(&$a) {
 			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>';
-- 
cgit v1.2.3