sforkowany z mirror/friendica
Merge pull request #5646 from annando/notes
The notes are now fetching their content from a central function2022.09-rc
commit
578549df13
|
@ -491,6 +491,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
|
|||
}
|
||||
}
|
||||
} elseif ($mode === 'notes') {
|
||||
$items = conversation_add_children($items, false, $order, $uid);
|
||||
$profile_owner = local_user();
|
||||
|
||||
if (!$update) {
|
||||
|
|
|
@ -65,26 +65,13 @@ function notes_content(App $a, $update = false)
|
|||
|
||||
$params = ['order' => ['created' => true],
|
||||
'limit' => [$a->pager['start'], $a->pager['itemspage']]];
|
||||
$r = Item::selectForUser(local_user(), ['id'], $condition, $params);
|
||||
$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
|
||||
|
||||
$count = 0;
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
$count = count($r);
|
||||
$parents_arr = [];
|
||||
|
||||
while ($rr = Item::fetch($r)) {
|
||||
$parents_arr[] = $rr['id'];
|
||||
}
|
||||
DBA::close($r);
|
||||
|
||||
$condition = ['uid' => local_user(), 'parent' => $parents_arr];
|
||||
$result = Item::selectForUser(local_user(), [], $condition);
|
||||
|
||||
if (DBA::isResult($result)) {
|
||||
$items = conv_sort(Item::inArray($result), 'commented');
|
||||
$o .= conversation($a, $items, 'notes', $update);
|
||||
}
|
||||
$o .= conversation($a, DBA::toArray($r), 'notes', $update);
|
||||
}
|
||||
|
||||
$o .= alt_pager($a, $count);
|
||||
|
|
Ładowanie…
Reference in New Issue