diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-16 17:51:00 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-16 17:51:00 -0700 |
| commit | 3c22a7b4823d9b47e91d39f2984cb54d6fe0d80f (patch) | |
| tree | 8618292a57d8d56ecf69d98bf87e00abec9b946d /Zotlabs | |
| parent | df3eb562f09dc8c9248d9f76c7cf48480027075e (diff) | |
| parent | 7a39ccf7bb3c61a354207486f83b970641e54680 (diff) | |
| download | volse-hubzilla-3c22a7b4823d9b47e91d39f2984cb54d6fe0d80f.tar.gz volse-hubzilla-3c22a7b4823d9b47e91d39f2984cb54d6fe0d80f.tar.bz2 volse-hubzilla-3c22a7b4823d9b47e91d39f2984cb54d6fe0d80f.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/File_upload.php | 9 | ||||
| -rw-r--r-- | Zotlabs/Module/Profile_photo.php | 2 |
2 files changed, 6 insertions, 5 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 { diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index e8f0e5186..47b627015 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -190,7 +190,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { build_sync_packet($channel['channel_id'],array('file' => array($sync))); - // Similarly, tell the nav bar to bypass the cache and update the avater image. + // Similarly, tell the nav bar to bypass the cache and update the avatar image. $_SESSION['reload_avatar'] = true; info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); |