bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

unify hcard and vcard

Browse source
This commit is contained in:
rabuzarus 2015-12-01 18:31:08 +01:00
commit 89c5989cfb
23 changed files with 234 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/directory.php
View file

@ -86,7 +86,7 @@ function directory_content(&$a) {
$limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
$r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
`contact`.`addr` AS faddr, `contact`.`url` AS profile_url FROM `profile`
`contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
@ -102,7 +102,7 @@ function directory_content(&$a) {
$community = '';
$itemurl= '';
$itemurl = (($rr['faddr'] != "") ? $rr['faddr'] : $rr['profile_url']);
$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
$profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);