diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 06:27:13 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 06:27:13 +0100 |
| commit | 5189a56ef832e1c5c6976f87d77d218bf4a6c221 (patch) | |
| tree | 4c1aa63a36eeaadab00c61eb05f3f9f5ae0da095 /mod/community.php | |
| parent | 751e4181e5e875b9f9850700a3687774e4c53ab3 (diff) | |
| parent | d81256d7b051d9a76b087feeb64ac79fb4aeff4d (diff) | |
| download | volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.gz volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.bz2 volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'mod/community.php')
| -rwxr-xr-x | mod/community.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mod/community.php b/mod/community.php index a98999942..f8cc3305b 100755 --- a/mod/community.php +++ b/mod/community.php @@ -41,15 +41,16 @@ function community_content(&$a, $update = 0) { // Here is the way permissions work in this module... - // Only public wall posts can be shown + // Only public posts can be shown // OR your own posts if you are a logged in member $r = q("SELECT COUNT(*) 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 `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 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 " ); @@ -69,8 +70,9 @@ function community_content(&$a, $update = 0) { 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 `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 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 ORDER BY `received` DESC LIMIT %d, %d ", intval($a->pager['start']), |