clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

And now the notes

This commit is contained in:
Michael 2018-06-10 08:30:27 +00:00
parent a89a1f31b5
commit b26c5e7f73
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mod/notes.php
View File

@ -7,6 +7,7 @@ use Friendica\Content\Nav;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\Item;
function notes_init(App $a) function notes_init(App $a)
{ {
@ -112,22 +113,11 @@ function notes_content(App $a, $update = false)
foreach ($r as $rr) { foreach ($r as $rr) {
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['item_id'];
} }
$parents_str = implode(', ', $parents_arr);
$r = q("SELECT %s FROM `item` %s
WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
$sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
item_fieldlists(),
item_joins(local_user()),
item_condition(),
intval(local_user()),
dbesc($parents_str)
);
if (DBM::is_result($r)) {
$items = conv_sort($r, "`commented`");
$condition = ['uid' => local_user(), 'parent' => $parents_arr];
$result = Item::select(local_user(), [], $condition);
if (DBM::is_result($result)) {
$items = conv_sort(dba::inArray($result), 'commented');
$o .= conversation($a, $items, 'notes', $update); $o .= conversation($a, $items, 'notes', $update);
} }
} }