aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Filestorage.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-09 06:53:31 +1000
committerredmatrix <git@macgirvin.com>2016-05-09 06:53:31 +1000
commit5ac262bd610097b0e756003c39bc9fad4df7c321 (patch)
tree0c3ef6ae7bd82e2b7337d8cb4b336faee89b7d59 /Zotlabs/Module/Filestorage.php
parent2b77c9a74bf4393dd3894420e602e7212c29ba42 (diff)
parent09ef30feb0e6f38ee3de34a37270cf796850b3d4 (diff)
downloadvolse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.tar.gz
volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.tar.bz2
volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.zip
Merge pull request #370 from Treer/permissions
ACL dialogs: Make the non-ACL-option description more accurate
Diffstat (limited to 'Zotlabs/Module/Filestorage.php')
-rw-r--r--Zotlabs/Module/Filestorage.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php
index 934a1e6a4..2861f31be 100644
--- a/Zotlabs/Module/Filestorage.php
+++ b/Zotlabs/Module/Filestorage.php
@@ -6,6 +6,8 @@ namespace Zotlabs\Module;
*/
require_once('include/attach.php');
+require_once('include/PermissionDescription.php');
+
/**
*
@@ -132,7 +134,7 @@ class Filestorage extends \Zotlabs\Web\Controller {
$cloudpath = get_cloudpath($f) . (intval($f['is_dir']) ? '?f=&davguest=1' : '');
$parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
- $aclselect_e = populate_acl($f, false);
+ $aclselect_e = populate_acl($f, false, \PermissionDescription::fromGlobalPermission('view_storage'));
$is_a_dir = (intval($f['is_dir']) ? true : false);
$lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock');