diff options
author | Treer <treer.git@the-bordello.com> | 2016-05-08 21:27:52 +1000 |
---|---|---|
committer | Treer <treer.git@the-bordello.com> | 2016-05-08 21:27:52 +1000 |
commit | 09ef30feb0e6f38ee3de34a37270cf796850b3d4 (patch) | |
tree | 0c3ef6ae7bd82e2b7337d8cb4b336faee89b7d59 /Zotlabs/Module/Photos.php | |
parent | e7a65c1f8d97b92e311beb064a7094216e23b119 (diff) | |
download | volse-hubzilla-09ef30feb0e6f38ee3de34a37270cf796850b3d4.tar.gz volse-hubzilla-09ef30feb0e6f38ee3de34a37270cf796850b3d4.tar.bz2 volse-hubzilla-09ef30feb0e6f38ee3de34a37270cf796850b3d4.zip |
Update some modules to use new ACL dialog feature
Diffstat (limited to 'Zotlabs/Module/Photos.php')
-rw-r--r-- | Zotlabs/Module/Photos.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 2b7f5525f..1659350a5 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -9,6 +9,7 @@ require_once('include/security.php'); require_once('include/Contact.php'); require_once('include/attach.php'); require_once('include/text.php'); +require_once('include/PermissionDescription.php'); @@ -632,7 +633,7 @@ class Photos extends \Zotlabs\Web\Controller { $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); } - $aclselect = (($_is_owner) ? populate_acl($channel_acl,false) : ''); + $aclselect = (($_is_owner) ? populate_acl($channel_acl,false, \PermissionDescription::fromGlobalPermission('view_storage')) : ''); // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables // don't exist. They really should be set to a parseable representation of the channel's default permissions @@ -1022,7 +1023,7 @@ class Photos extends \Zotlabs\Web\Controller { if($can_post) { $album_e = $ph[0]['album']; $caption_e = $ph[0]['description']; - $aclselect_e = (($_is_owner) ? populate_acl($ph[0]) : ''); + $aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \PermissionDescription::fromGlobalPermission('view_storage')) : ''); $albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer'])); $_SESSION['album_return'] = bin2hex($ph[0]['album']); |