aboutsummaryrefslogtreecommitdiffstats
path: root/mod/community.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-03-26 20:17:01 +0100
committerThomas Willingham <founder@kakste.com>2012-03-26 20:17:01 +0100
commit286c230fa858b7b1fead9c3ff722f6b1b9478d01 (patch)
tree463f0d075f9593a4d513aa91e08ebc896b00779a /mod/community.php
parent64a2b00cdc97e40ac8e9dc8f0b9cdc5d78cdf2c2 (diff)
parent0a3f2bdd5bc51d7fc642f431843a5b13287ae94e (diff)
downloadvolse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.tar.gz
volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.tar.bz2
volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.zip
Merge remote-tracking branch 'main/master'
Diffstat (limited to 'mod/community.php')
-rwxr-xr-xmod/community.php12
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']),