diff options
| author | zottel <github@zottel.net> | 2012-03-22 09:16:10 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-22 09:16:10 +0100 |
| commit | 3f3c4aec79bf3ceedd551bae7cec7acfd68e3772 (patch) | |
| tree | ae5af3e8b7dda429b744c70ea3fda111c30b15c3 /mod/community.php | |
| parent | 88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e (diff) | |
| parent | 576eb6cc389d54c29b29b97d3c6d160e61bbf6ca (diff) | |
| download | volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.tar.gz volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.tar.bz2 volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/community.php')
| -rwxr-xr-x | mod/community.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/community.php b/mod/community.php index cf459617e..f8cc3305b 100755 --- a/mod/community.php +++ b/mod/community.php @@ -50,7 +50,7 @@ function community_content(&$a, $update = 0) { 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 `user`.`hidewall` = 0 + AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 " ); @@ -72,7 +72,7 @@ function community_content(&$a, $update = 0) { 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 `user`.`hidewall` = 0 + 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']), |