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

Merge pull request #11447 from annando/contacts-posts 

Fix: Show reshared posts on the contact page
This commit is contained in:
Hypolite Petovan 2022-04-27 10:35:24 -04:00 committed by GitHub
parent 973257ae13 144c9f00f4
commit 5a08bca15b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Model/Contact.php
View File

@ -1456,12 +1456,13 @@ class Contact
} }
if ($thread_mode) { if ($thread_mode) {
$items = Post::toArray(Post::selectForUser(local_user(), ['uri-id'], $condition, $params)); $fields = ['uri-id', 'thr-parent-id', 'gravity', 'author-id', 'commented'];
$items = Post::toArray(Post::selectForUser(local_user(), $fields, $condition, $params));
if ($pager->getStart() == 0) { if ($pager->getStart() == 0) {
$cdata = Contact::getPublicAndUserContactID($cid, local_user()); $cdata = Contact::getPublicAndUserContactID($cid, local_user());
if (!empty($cdata['public'])) { if (!empty($cdata['public'])) {
$pinned = Post\Collection::selectToArrayForContact($cdata['public'], Post\Collection::FEATURED, ['uri-id']); $pinned = Post\Collection::selectToArrayForContact($cdata['public'], Post\Collection::FEATURED, $fields);
$items = array_merge($items, $pinned); $items = array_merge($items, $pinned);
} }
} }