tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #6260 from annando/issue-6257

Browse source 
Issue 6257: Make notes visible again
This commit is contained in:
Hypolite Petovan 2018-12-13 15:41:56 -05:00 committed by GitHub
parent 2d9e1b8ec2 f6c3974c8f
commit f6917dd8f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/conversation.php
View file

@ -497,7 +497,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
}
}
} elseif ($mode === 'notes') {
$items = conversation_add_children($items, false, $order, $uid);
$items = conversation_add_children($items, false, $order, local_user());
$profile_owner = local_user();
if (!$update) {

4
mod/notes.php
View file

@ -59,7 +59,7 @@ function notes_content(App $a, $update = false)
}
$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
'wall' => false, 'contact-id'=> $a->contact['id']];
'contact-id'=> $a->contact['id']];
$pager = new Pager($a->query_string, 40);
@ -70,7 +70,7 @@ function notes_content(App $a, $update = false)
$count = 0;
if (DBA::isResult($r)) {
$notes = DBA::toArray($r);
$notes = Item::inArray($r);
$count = count($notes);