Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-01-09 14:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Indention, documentation

Browse source
This commit is contained in:
Michael 2020-11-03 20:30:59 +00:00
parent 4965d6aa54
commit 65b07aead4
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/conversation.php
View file

@ -833,7 +833,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
$condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)", $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)",
$parent['uri'], $uid, Verb::getID(Activity::FOLLOW)]; $parent['uri'], $uid, Verb::getID(Activity::FOLLOW)];
$causer = 0; $causer = 0;
} }
$items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params, $causer); $items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params, $causer);
} }
@ -851,12 +851,12 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
/** /**
* Fetch conversation items * Fetch conversation items
* *
* @param array $parent * @param array $parent Parent Item array
* @param array $items * @param array $items Item array
* @param array $condition * @param array $condition SQL condition
* @param boolean $block_authors * @param boolean $block_authors Don't show posts from contacts that are hidden (used on the community page)
* @param array $params * @param array $params SQL parameters
* @param integer $causer * @param integer $causer Contact ID of the resharer
* @return array * @return array
*/ */
function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params, int $causer) { function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params, int $causer) {

3
src/Model/Item.php
View file

@ -3421,7 +3421,8 @@ class Item
// Authenticated visitor - fetch the matching permissionsets // Authenticated visitor - fetch the matching permissionsets
$set = PermissionSet::get($owner_id, $remote_user); $set = PermissionSet::get($owner_id, $remote_user);
if (!empty($set)) { if (!empty($set)) {
$condition = ["(`private` != ? OR (`private` = ? AND `wall` AND `psid` IN (?" . str_repeat(",?", count($set) - 1) . ")))", $condition = ["(`private` != ? OR (`private` = ? AND `wall`
AND `psid` IN (" . implode(', ', array_fill(0, count($set), '?')) . ")))",
Item::PRIVATE, Item::PRIVATE]; Item::PRIVATE, Item::PRIVATE];
$condition = array_merge($condition, $set); $condition = array_merge($condition, $set);
} }