diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-09-03 19:15:59 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-09-03 19:15:59 +0400 |
| commit | 725360fa14f3665f1c8d4c5d23c61580489885f5 (patch) | |
| tree | f835f218b0207c6e38d21f429cc6f60fed207411 /apps/files | |
| parent | 69f198d6fbe6309de3af83267110d83c7013ca68 (diff) | |
| parent | be07def0afa23d234ce7575013a8bcb7c113d5d1 (diff) | |
Merge pull request #10250 from owncloud/block-folder-upload-stable6
Prevent folder upload causing unexpected behavior
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/file-upload.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index e8b578133b3..8bfa4022bff 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -231,7 +231,7 @@ $(document).ready(function() { data.errorThrown = errorMessage; } - if (file.type === '' && file.size === 4096) { + if ((file.type === '' && file.size === 4096) || file.relativePath) { data.textStatus = 'dirorzero'; data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes', {filename: file.name} |