|
|
|
@ -93,7 +93,7 @@ function display_content(&$a) {
|
|
|
|
|
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` |
|
|
|
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 |
|
|
|
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 |
|
|
|
|
AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' )) |
|
|
|
|
AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ) AND `type` != 'remote' ) |
|
|
|
|
$sql_extra |
|
|
|
|
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ", |
|
|
|
|
intval($a->profile['uid']), |
|
|
|
@ -214,7 +214,7 @@ function display_content(&$a) {
|
|
|
|
|
$diff_author = (($item['url'] !== $item['author-link']) ? true : false); |
|
|
|
|
|
|
|
|
|
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); |
|
|
|
|
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb); |
|
|
|
|
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']); |
|
|
|
|
|
|
|
|
|
$profile_link = $profile_url; |
|
|
|
|
|
|
|
|
|