diff options
| author | Friendika <info@friendika.com> | 2011-07-05 23:23:43 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-07-05 23:23:43 -0700 |
| commit | 84d12c3e08ae4b6fe228ce881b0c1570175d1667 (patch) | |
| tree | bb8f4ccca207ff6c226cf79f4ce348c5bc8d9df9 /mod/community.php | |
| parent | c221d5ea597040c27a8918f9c08629e979a6e273 (diff) | |
| download | volse-hubzilla-84d12c3e08ae4b6fe228ce881b0c1570175d1667.tar.gz volse-hubzilla-84d12c3e08ae4b6fe228ce881b0c1570175d1667.tar.bz2 volse-hubzilla-84d12c3e08ae4b6fe228ce881b0c1570175d1667.zip | |
move hidewall to user table - queries are getting too complicated and servers falling over
Diffstat (limited to 'mod/community.php')
| -rw-r--r-- | mod/community.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mod/community.php b/mod/community.php index 90cb7a574..73feaabc6 100644 --- a/mod/community.php +++ b/mod/community.php @@ -42,11 +42,11 @@ function community_content(&$a, $update = 0) { $r = q("SELECT COUNT(*) AS `total` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `profile` ON `profile`.`uid` = `item`.`uid` + 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 `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `profile`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `profile`.`is-default` = 1 " + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 " ); if(count($r)) @@ -61,14 +61,13 @@ function community_content(&$a, $update = 0) { `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`, - `user`.`nickname`, `profile`.`hidewall` + `user`.`nickname`, `user`.`hidewall` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` - LEFT JOIN `profile` ON `profile`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `profile`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `profile`.`is-default` = 1 + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 ORDER BY `received` DESC LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']) |