diff options
| author | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
|---|---|---|
| committer | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
| commit | 273594af62c960b5a52da5ec1cf6d6bd450415ba (patch) | |
| tree | 5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /mod/match.php | |
| parent | 1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff) | |
| parent | dfd5cc57c2134067dc6229b8583b5e808f160004 (diff) | |
| download | volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2 volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/match.php')
| -rw-r--r-- | mod/match.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mod/match.php b/mod/match.php index 5dd80fe3e..eea2dad4f 100644 --- a/mod/match.php +++ b/mod/match.php @@ -22,6 +22,7 @@ function match_content(&$a) { $params = array(); $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']); + if($tags) { $params['s'] = $tags; if($a->pager['page'] != 1) @@ -40,15 +41,17 @@ function match_content(&$a) { } if(count($j->results)) { + + $tpl = get_markup_template('match.tpl'); 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->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>'; + + $o .= replace_macros($tpl,array( + '$url' => $jj->url, + '$name' => $jj->name, + '$photo' => $jj->photo, + '$tags' => $jj->tags + )); } - $o .= '<div id="profile-match-wrapper-end"></div>'; } else { info( t('No matches') . EOL); |