diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
| commit | 6424bac47ce7f81991d23d2407cbb4c08dbfdf69 (patch) | |
| tree | 5a664f58749fe45923f77881310cdd295859afb5 /Zotlabs/Module/Filestorage.php | |
| parent | a01baab4f0dc1654dfe2d2cc6fc78e5c3c8d9f4e (diff) | |
| parent | bdd7d24ac1ccf8f7c5b8939cf23a6a156da959c1 (diff) | |
| download | volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.gz volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.bz2 volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Filestorage.php')
| -rw-r--r-- | Zotlabs/Module/Filestorage.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 2861f31be..c3ef22e32 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -6,7 +6,6 @@ namespace Zotlabs\Module; */ require_once('include/attach.php'); -require_once('include/PermissionDescription.php'); /** @@ -134,7 +133,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, \PermissionDescription::fromGlobalPermission('view_storage')); + $aclselect_e = populate_acl($f, false, \Zotlabs\Lib\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'); |