diff options
| author | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
| commit | a2c4ce74871dbe9e640cdeafc1574bda5b7fe144 (patch) | |
| tree | fce1c1b2d497adae72d77e09c6bf005c8900256b /mod/community.php | |
| parent | 0bad8de0562a50fa93b0af5fd4cf8d7123a11b46 (diff) | |
| parent | f299749758112361ee6384cd75d11b2c3a57352a (diff) | |
| download | volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.gz volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.bz2 volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/community.php')
| -rw-r--r-- | mod/community.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/community.php b/mod/community.php index f8cc3305b..bfe5a3089 100644 --- a/mod/community.php +++ b/mod/community.php @@ -45,13 +45,13 @@ function community_content(&$a, $update = 0) { // OR your own posts if you are a logged in member - $r = q("SELECT COUNT(*) AS `total` + $r = q("SELECT distinct(`item`.`uri`) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 " + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri` " ); if(count($r)) @@ -62,7 +62,7 @@ function community_content(&$a, $update = 0) { return $o; } - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, @@ -73,7 +73,7 @@ function community_content(&$a, $update = 0) { AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri` ORDER BY `received` DESC LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']) |