keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5646 from annando/notes

Browse source 
The notes are now fetching their content from a central function
This commit is contained in:
Tobias Diekershoff 2018-08-21 17:36:15 +02:00 committed by GitHub
commit 578549df13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/conversation.php
View file

@ -491,6 +491,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
} }
} }
} elseif ($mode === 'notes') { } elseif ($mode === 'notes') {
$items = conversation_add_children($items, false, $order, $uid);
$profile_owner = local_user(); $profile_owner = local_user();
if (!$update) { if (!$update) {

17
mod/notes.php
View file

@ -65,26 +65,13 @@ function notes_content(App $a, $update = false)
$params = ['order' => ['created' => true], $params = ['order' => ['created' => true],
'limit' => [$a->pager['start'], $a->pager['itemspage']]]; '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; $count = 0;
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$count = count($r); $count = count($r);
$parents_arr = []; $o .= conversation($a, DBA::toArray($r), 'notes', $update);
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 .= alt_pager($a, $count); $o .= alt_pager($a, $count);