friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 08:24:59 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Use dba to access database in api_lists_statuses()

Browse source
This commit is contained in:
Pierre Rudloff 2018-04-07 22:35:19 +02:00
parent fea7ec2482
commit 6401eb988b
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/api.php
View file

@ -3381,7 +3381,7 @@ function api_lists_statuses($type)
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
} }
$statuses = q( $statuses = dba::p(
"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, "SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@ -3390,18 +3390,15 @@ function api_lists_statuses($type)
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
AND (NOT `contact`.`blocked` OR `contact`.`pending`) AND (NOT `contact`.`blocked` OR `contact`.`pending`)
STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = `item`.`contact-id` STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `verb` = '%s' WHERE `item`.`uid` = ? AND `verb` = ?
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
$sql_extra AND `item`.`id`>?
AND `item`.`id`>%d AND `group_member`.`gid` = ?
AND `group_member`.`gid` = %d ORDER BY `item`.`id` DESC LIMIT ".intval($start)." ,".intval($count),
ORDER BY `item`.`id` DESC LIMIT %d ,%d ", api_user(),
intval(api_user()), ACTIVITY_POST,
dbesc(ACTIVITY_POST), $since_id,
intval($since_id), $_REQUEST['list_id']
intval($_REQUEST['list_id']),
intval($start),
intval($count)
); );
$items = api_format_items($statuses, $user_info, false, $type); $items = api_format_items($statuses, $user_info, false, $type);