friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Posts from contacts weren't displayed correctly

This commit is contained in:
Michael 2018-01-05 19:47:55 +00:00
parent 045a0b2a00
commit 2d9163ce30
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));