aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-12 16:07:04 -0800
committerzotlabs <mike@macgirvin.com>2017-11-12 16:07:04 -0800
commit59caf141d1e271ee4a6e7ab8b66f4070835dde95 (patch)
tree44056bdac329f6356fa75ed3566c88568677d89f /include/conversation.php
parent71a30cd9a5f5c749e3b76e961876afbd0afa87f9 (diff)
parent6ea7ef43e0a0a99f81986c8e1fe5955800bfa496 (diff)
downloadvolse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.gz
volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.bz2
volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 2ce4dacef..0b9df5acd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -581,6 +581,9 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
|| $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;
+ }
}
else {
$uploading = false;