diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-05-11 13:31:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-05-11 13:31:36 +0200 |
| commit | 1ebc9de1e6c7e242cfe6e39ab3c4b82d53e1539b (patch) | |
| tree | 1d56593f76d9008cb3747a485ac9c01cbba597bd /Zotlabs | |
| parent | f34b060e23baf02b1dc7865f4b5d964aae391f9b (diff) | |
| download | volse-hubzilla-1ebc9de1e6c7e242cfe6e39ab3c4b82d53e1539b.tar.gz volse-hubzilla-1ebc9de1e6c7e242cfe6e39ab3c4b82d53e1539b.tar.bz2 volse-hubzilla-1ebc9de1e6c7e242cfe6e39ab3c4b82d53e1539b.zip | |
Empty ACL should not result in no ACL when uploading a file
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/File_upload.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php index 769134808..29a7bd137 100644 --- a/Zotlabs/Module/File_upload.php +++ b/Zotlabs/Module/File_upload.php @@ -28,11 +28,12 @@ class File_upload extends \Zotlabs\Web\Controller { $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); } + $_REQUEST['allow_cid'] = perms2str($_REQUEST['contact_allow']); + $_REQUEST['allow_gid'] = perms2str($_REQUEST['group_allow']); + $_REQUEST['deny_cid'] = perms2str($_REQUEST['contact_deny']); + $_REQUEST['deny_gid'] = perms2str($_REQUEST['group_deny']); + if($_REQUEST['filename']) { - $_REQUEST['allow_cid'] = perms2str($_REQUEST['contact_allow']); - $_REQUEST['allow_gid'] = perms2str($_REQUEST['group_allow']); - $_REQUEST['deny_cid'] = perms2str($_REQUEST['contact_deny']); - $_REQUEST['deny_gid'] = perms2str($_REQUEST['group_deny']); $r = attach_mkdir($channel,get_observer_hash(),$_REQUEST); } else { |