aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/File_upload.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-05-11 13:31:36 +0200
committerMario Vavti <mario@mariovavti.com>2017-05-12 10:16:12 +0200
commitd5e436d15b7bdfecce94577c8e4405ab66886e91 (patch)
treef01f0d734b010150c28afc5484097fe55a35031a /Zotlabs/Module/File_upload.php
parentb60f1085db68c27b0388ec3705c4dc44a6ca03b6 (diff)
downloadvolse-hubzilla-d5e436d15b7bdfecce94577c8e4405ab66886e91.tar.gz
volse-hubzilla-d5e436d15b7bdfecce94577c8e4405ab66886e91.tar.bz2
volse-hubzilla-d5e436d15b7bdfecce94577c8e4405ab66886e91.zip
Empty ACL should not result in no ACL when uploading a file
Diffstat (limited to 'Zotlabs/Module/File_upload.php')
-rw-r--r--Zotlabs/Module/File_upload.php9
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 {