diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-14 14:50:36 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-14 14:50:36 -0800 |
| commit | d43542dd7a64136626550ba0569b1939b84b8146 (patch) | |
| tree | f19c6f9716fcc9fe72e573d778bb45eb1c397051 /include/conversation.php | |
| parent | 59caf141d1e271ee4a6e7ab8b66f4070835dde95 (diff) | |
| parent | 3c3c0ed34269cecdbda1288eab5b63c664a8859c (diff) | |
| download | volse-hubzilla-d43542dd7a64136626550ba0569b1939b84b8146.tar.gz volse-hubzilla-d43542dd7a64136626550ba0569b1939b84b8146.tar.bz2 volse-hubzilla-d43542dd7a64136626550ba0569b1939b84b8146.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/include/conversation.php b/include/conversation.php index 0b9df5acd..1cbd9116c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -573,22 +573,16 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa if (! feature_enabled($profile_owner,'multi_delete')) $page_dropping = false; - $uploading = true; - - if($profile_owner > 0) { - $owner_channel = channelx_by_n($profile_owner); - if($owner_channel['channel_allow_cid'] || $owner_channel['channel_allow_gid'] - || $owner_channel['channel_deny_cid'] || $owner_channel['channel_deny_gid']) { - $uploading = false; - } - if(\Zotlabs\Access\PermissionLimits::Get($profile_owner,'view_storage') !== PERMS_PUBLIC) { - $uploading = false; + $uploading = false; + + if(local_channel()) { + $cur_channel = App::get_channel(); + if($cur_channel['channel_allow_cid'] === '' && $cur_channel['channel_allow_gid'] === '' + && $cur_channel['channel_deny_cid'] === '' && $cur_channel['channel_deny_gid'] === '' + && intval(\Zotlabs\Access\PermissionLimits::Get(local_channel(),'view_storage')) === PERMS_PUBLIC) { + $uploading = true; } } - else { - $uploading = false; - } - $channel = App::get_channel(); $observer = App::get_observer(); |