Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4175 from annando/contact-posts

Browse source 
Posts from contacts weren't displayed correctly
This commit is contained in:
Hypolite Petovan 2018-01-05 14:52:23 -05:00 committed by GitHub
commit 5142528913
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/conversation.php
View file

@ -628,7 +628,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$writable = false;
}
if ($mode === 'network-new' || $mode === 'search' || $community_readonly) {
if (in_array($mode, ['network-new', 'search', 'contact-posts']) || $community_readonly) {
/*
* "New Item View" on network page or search page results

6
src/Model/Contact.php
View file

@ -875,11 +875,13 @@ class Contact extends BaseObject
$contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
$r = q(item_query() . " AND `item`.`" . $contact . "` = %d AND " . $sql .
" ORDER BY `item`.`created` DESC LIMIT %d, %d", intval($author_id), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])
" AND `item`.`verb` = '%s' ORDER BY `item`.`created` DESC LIMIT %d, %d",
intval($author_id), intval(local_user()), dbesc(ACTIVITY_POST),
intval($a->pager['start']), intval($a->pager['itemspage'])
);
$o = conversation($a, $r, 'community', false);
$o = conversation($a, $r, 'contact-posts', false);
$o .= alt_pager($a, count($r));