nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4581 from annando/issue-4497

Browse source 
Issue 4497: Forum feeds had been empty
This commit is contained in:
Hypolite Petovan 2018-03-11 10:10:06 -04:00 committed by GitHub
parent 903d1e1172 cc4347d72f
commit 9941c73a31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Protocol/OStatus.php
View file

@ -2094,7 +2094,7 @@ class OStatus
} }
$owner = dba::fetch_first( $owner = dba::fetch_first(
"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags` "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1", WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1",
$owner_nick $owner_nick
@ -2119,12 +2119,14 @@ class OStatus
$sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT)); $sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT));
} }
if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) {
$sql_extra .= sprintf(" AND `item`.`contact-id` = %d AND `item`.`author-id` = %d ", intval($owner["id"]), intval($authorid));
}
$items = q( $items = q(
"SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`) "SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent` STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
WHERE `item`.`uid` = %d WHERE `item`.`uid` = %d
AND `item`.`contact-id` = %d
AND `item`.`author-id` = %d
AND `item`.`created` > '%s' AND `item`.`created` > '%s'
AND NOT `item`.`deleted` AND NOT `item`.`deleted`
AND NOT `item`.`private` AND NOT `item`.`private`
@ -2133,8 +2135,6 @@ class OStatus
$sql_extra $sql_extra
ORDER BY `item`.`created` DESC LIMIT %d", ORDER BY `item`.`created` DESC LIMIT %d",
intval($owner["uid"]), intval($owner["uid"]),
intval($owner["id"]),
intval($authorid),
dbesc($check_date), dbesc($check_date),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),