friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Add the space at a different place

This commit is contained in:
Michael 2020-05-28 06:08:03 +00:00
parent 51e9b25700
commit bdfe47dcfd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/conversation.php
View File

@ -771,7 +771,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
$items = []; $items = [];
foreach ($parents AS $parent) { foreach ($parents AS $parent) {
$condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND `vid` != ? ", $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND `vid` != ?",
$parent['uri'], $uid, Verb::getID(Activity::FOLLOW)]; $parent['uri'], $uid, Verb::getID(Activity::FOLLOW)];
$items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params); $items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params);
} }
@ -799,7 +799,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
*/ */
function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params) { function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params) {
if ($block_authors) { if ($block_authors) {
$condition[0] .= "AND NOT `author`.`hidden`"; $condition[0] .= " AND NOT `author`.`hidden`";
} }
$thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity']), $condition, $params); $thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity']), $condition, $params);