clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4512 from annando/tag-comment 

Following tags on the network page should now work for comments as well
This commit is contained in:
Hypolite Petovan 2018-02-27 08:46:32 -05:00 committed by GitHub
parent 4fe1d804ab 99c6711cfd
commit 99bea7f4c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/network.php
View File

@ -819,7 +819,7 @@ function networkThreadedView(App $a, $update = 0)
$top_limit = DateTimeFormat::utcNow();
}
$items = dba::p("SELECT `item`.`uri`, `item`.`id` AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
$items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
ON `item`.`id` = `term`.`oid`
@ -860,7 +860,7 @@ function networkThreadedView(App $a, $update = 0)
if ($date_offset < $item['order_date']) {
$date_offset = $item['order_date'];
}
if (!in_array($item['item_id'], $parents_arr)) {
if (!in_array($item['item_id'], $parents_arr) && ($item['item_id'] > 0)) {
$parents_arr[] = $item['item_id'];
}
}