diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-19 17:55:27 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-19 17:55:27 +0100 |
| commit | 8e22c669a0668fc0498e9c1d822dcefd97bae1e5 (patch) | |
| tree | f342d0587a151ed6ef76c9832ab60b6644b34031 /mod/directory.php | |
| parent | 13fa27f7578d292d8d722554ce6211e8e0bc91af (diff) | |
| parent | 766ade06d5e3b387d1fd3d2d0b00b15852e877b1 (diff) | |
| download | volse-hubzilla-8e22c669a0668fc0498e9c1d822dcefd97bae1e5.tar.gz volse-hubzilla-8e22c669a0668fc0498e9c1d822dcefd97bae1e5.tar.bz2 volse-hubzilla-8e22c669a0668fc0498e9c1d822dcefd97bae1e5.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/directory.php')
| -rw-r--r-- | mod/directory.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/directory.php b/mod/directory.php index f70cd6df8..0504ac321 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -40,7 +40,7 @@ function directory_content(&$a) { if($search) $search = dbesc($search); - $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : ""); + $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : ""); $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " ); @@ -68,6 +68,9 @@ function directory_content(&$a) { $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); + + $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : ''); + $details = ''; if(strlen($rr['locality'])) $details .= $rr['locality']; @@ -94,7 +97,7 @@ function directory_content(&$a) { '$photo' => $rr[$photo], '$alt-text' => $rr['name'], '$name' => $rr['name'], - '$details' => $details + '$details' => $pdesc . $details )); |