diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-06 00:02:11 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-06 00:02:11 +0200 |
| commit | dad91c156fe63894b145530687ed5b9f84a3e571 (patch) | |
| tree | d1a3a67d429185dbc5597e8f485709757211cbc9 /apps/files_sharing/public.php | |
| parent | e159cbf527822edc28522df48b0526419835ca29 (diff) | |
| parent | bc1c77664205c8e044cf611a9339773a9f8af2c6 (diff) | |
| download | nextcloud-server-dad91c156fe63894b145530687ed5b9f84a3e571.tar.gz nextcloud-server-dad91c156fe63894b145530687ed5b9f84a3e571.zip | |
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
Diffstat (limited to 'apps/files_sharing/public.php')
| -rw-r--r-- | apps/files_sharing/public.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 7c9158d8002..0c3d6fb7b25 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -137,6 +137,9 @@ if (isset($path)) { if (\OCP\App::isEnabled('files_encryption')) { $allowPublicUploadEnabled = false; } + if (isset($file)) { + $allowPublicUploadEnabled = false; + } $tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled); $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); |