aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-12-01 14:01:04 -0800
committerFriendika <info@friendika.com>2010-12-01 14:01:04 -0800
commitf9f018ef083acb554003def1fc186bfc3102acc0 (patch)
tree64344c7a0866d72d978713eba453beca4db223fb /mod
parent9513f1f1668a33be3fc2b241fe3662e9de42d84b (diff)
downloadvolse-hubzilla-f9f018ef083acb554003def1fc186bfc3102acc0.tar.gz
volse-hubzilla-f9f018ef083acb554003def1fc186bfc3102acc0.tar.bz2
volse-hubzilla-f9f018ef083acb554003def1fc186bfc3102acc0.zip
potential for privacy leakage, plus photo not showing occasionally
Diffstat (limited to 'mod')
-rw-r--r--mod/display.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/display.php b/mod/display.php
index af121abdb..aa9455361 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -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;