mirror of
https://github.com/friendica/friendica
synced 2024-12-23 09:20:17 +00:00
Issue 11310: Show pinned posts when not logged in
This commit is contained in:
parent
7c282c597d
commit
a2a5f05a19
2 changed files with 3 additions and 3 deletions
|
@ -454,7 +454,7 @@ class Conversation
|
|||
. "'; </script>\r\n";
|
||||
}
|
||||
} elseif ($mode === 'profile') {
|
||||
$items = $this->addChildren($items, false, $order, local_user());
|
||||
$items = $this->addChildren($items, false, $order, $uid);
|
||||
|
||||
if (!$update) {
|
||||
$tab = !empty($_GET['tab']) ? trim($_GET['tab']) : 'posts';
|
||||
|
@ -929,7 +929,7 @@ class Conversation
|
|||
$condition = DBA::mergeConditions($condition,
|
||||
["`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW)]);
|
||||
|
||||
$thread_items = Post::selectForUser(local_user(), array_merge(ItemModel::DISPLAY_FIELDLIST, ['pinned', 'contact-uid', 'gravity', 'post-type', 'post-reason']), $condition, $params);
|
||||
$thread_items = Post::selectForUser($uid, array_merge(ItemModel::DISPLAY_FIELDLIST, ['pinned', 'contact-uid', 'gravity', 'post-type', 'post-reason']), $condition, $params);
|
||||
|
||||
$items = [];
|
||||
|
||||
|
|
|
@ -218,7 +218,7 @@ class Status extends BaseProfile
|
|||
} elseif ($profile['uid'] == local_user()) {
|
||||
$condition = [];
|
||||
}
|
||||
|
||||
|
||||
$pinned_items = Post::selectPinned($profile['uid'], ['uri-id', 'pinned'], $condition);
|
||||
$pinned = Post::toArray($pinned_items);
|
||||
$items = array_merge($items, $pinned);
|
||||
|
|
Loading…
Reference in a new issue