mirror of
https://github.com/friendica/friendica
synced 2024-12-23 10:40:16 +00:00
Additional check if the duplicated entry isn't from a hidden or blocked contact.
This commit is contained in:
parent
043c406091
commit
2ab38de59c
1 changed files with 7 additions and 2 deletions
|
@ -35,13 +35,18 @@ function add_thread($itemid, $onlyshadow = false) {
|
||||||
if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED, "")))
|
if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED, "")))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Check, if hide-friends is activated - then don't do a shadow entry
|
// Only do these checks if the post isn't a wall post
|
||||||
// Only do this check if the post isn't a wall post
|
|
||||||
if (!$item["wall"]) {
|
if (!$item["wall"]) {
|
||||||
|
// Check, if hide-friends is activated - then don't do a shadow entry
|
||||||
$r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
|
$r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
|
||||||
$item['uid']);
|
$item['uid']);
|
||||||
if (!count($r))
|
if (!count($r))
|
||||||
return;
|
return;
|
||||||
|
// Check if the contact is hidden or blocked
|
||||||
|
$r = q("SELECT `id` FROM `contact` WHERE NOT `hidden` AND NOT `blocked` AND `id` = %d",
|
||||||
|
$item['contact-id']);
|
||||||
|
if (!count($r))
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only add a shadow, if the profile isn't hidden
|
// Only add a shadow, if the profile isn't hidden
|
||||||
|
|
Loading…
Reference in a new issue