|
|
|
@ -75,7 +75,7 @@ function display_content(&$a) {
|
|
|
|
|
" AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) |
|
|
|
|
AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' ) |
|
|
|
|
AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' ) |
|
|
|
|
AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ", |
|
|
|
|
AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ", |
|
|
|
|
|
|
|
|
|
intval($_SESSION['visitor_id']), |
|
|
|
|
intval($_SESSION['visitor_id']), |
|
|
|
@ -91,17 +91,19 @@ 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` = %d ) |
|
|
|
|
AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' )) |
|
|
|
|
$sql_extra |
|
|
|
|
ORDER BY `parent` DESC, `id` ASC ", |
|
|
|
|
intval($a->profile['uid']), |
|
|
|
|
intval($item_id) |
|
|
|
|
dbesc($item_id), |
|
|
|
|
dbesc($item_id) |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$cmnt_tpl = file_get_contents('view/comment_item.tpl'); |
|
|
|
|
|
|
|
|
|
$tpl = file_get_contents('view/wall_item.tpl'); |
|
|
|
|
$wallwall = file_get_contents('view/wallwall_item.tpl'); |
|
|
|
|
|
|
|
|
|
$return_url = $_SESSION['return_url'] = $a->cmd; |
|
|
|
|
|
|
|
|
@ -164,9 +166,6 @@ function display_content(&$a) {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); |
|
|
|
|
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); |
|
|
|
|
$profile_link = $profile_url; |
|
|
|
@ -187,12 +186,14 @@ function display_content(&$a) {
|
|
|
|
|
'$ago' => relative_date($item['created']), |
|
|
|
|
'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''), |
|
|
|
|
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), |
|
|
|
|
'$owner_url' => $owner_url, |
|
|
|
|
'$owner_photo' => $owner_photo, |
|
|
|
|
'$owner_name' => $owner_name, |
|
|
|
|
'$drop' => $drop, |
|
|
|
|
'$comment' => $comment |
|
|
|
|
)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $o; |
|
|
|
|
} |