keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #171 from fabrixxm/master

Browse source 
fix to network page conversations sort
This commit is contained in:
fabrixxm 2011-09-08 05:37:14 -07:00
commit 68c23f6c86
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mod/network.php
View file

@ -320,7 +320,8 @@ function network_content(&$a, $update = 0) {
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
, (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created`
FROM `item` AS `_com` FROM `item` AS `_com`
WHERE `_com`.`uid`=%d AND `_com`.`parent`!=`id` WHERE `_com`.`uid`=%d AND
(`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`))
GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com`
WHERE `item`.`id`=`com`.`parent` AND WHERE `item`.`id`=`com`.`parent` AND
`item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@ -333,7 +334,6 @@ function network_content(&$a, $update = 0) {
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
// Then fetch all the children of the parents that are on this page // Then fetch all the children of the parents that are on this page
$parents_arr = array(); $parents_arr = array();
@ -351,7 +351,8 @@ function network_content(&$a, $update = 0) {
FROM `item`, `contact`, FROM `item`, `contact`,
(SELECT `_com`.`parent`,max(`_com`.`created`) as `created` (SELECT `_com`.`parent`,max(`_com`.`created`) as `created`
FROM `item` AS `_com` FROM `item` AS `_com`
WHERE `_com`.`uid`=%d AND `_com`.`parent`!=`id` WHERE `_com`.`uid`=%d AND
(`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`))
GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`id` = `item`.`contact-id` AND `contact`.`id` = `item`.`contact-id`