diff options
| author | zotlabs <mike@macgirvin.com> | 2020-05-05 19:42:00 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-05-05 19:42:00 -0700 |
| commit | 79968ea07aa205e9c93993724d3f37362220b9d4 (patch) | |
| tree | 053bbcc9c213bd2e1da2b4a1c464be771929b2c3 /Zotlabs/Module/Channel.php | |
| parent | 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4 (diff) | |
| parent | 06d1cf83d2b1acfef5529fe388d2502bea381881 (diff) | |
| download | volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.tar.gz volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.tar.bz2 volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Channel.php')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 170b81787..08de059a8 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -239,8 +239,12 @@ class Channel extends Controller { /** * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups */ - - $item_normal = item_normal(); + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0 + and item.item_unpublished = 0 and item.item_pending_remove = 0 + and item.item_blocked = 0 "; + if (! $is_owner) + $item_normal .= "and item.item_delayed = 0 "; $item_normal_update = item_normal_update(); $sql_extra = item_permissions_sql(App::$profile['profile_uid']); |