diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-04-24 18:45:45 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-04-24 18:45:45 +0200 |
| commit | f520305848be6994a0726d907a0182aa07da0be8 (patch) | |
| tree | a5c05f26cf6f9a21dd1bc82abf517634199543e2 /apps/files/js/file-upload.js | |
| parent | 40257d9736ce0d7bad02bf4a1baa86d9b1fc8f7f (diff) | |
| parent | b312d38d38c4e391765beb0aadb6bd2eafd9cb2c (diff) | |
| download | nextcloud-server-f520305848be6994a0726d907a0182aa07da0be8.tar.gz nextcloud-server-f520305848be6994a0726d907a0182aa07da0be8.zip | |
Merge pull request #8026 from owncloud/remove_shared_folder
remove the "Shared" folder
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 3879aa65888..03ebdccb32d 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -235,7 +235,7 @@ OC.Upload = { var file = data.files[0]; try { // FIXME: not so elegant... need to refactor that method to return a value - Files.isFileNameValid(file.name, FileList.getCurrentDirectory()); + Files.isFileNameValid(file.name); } catch (errorMessage) { data.textStatus = 'invalidcharacters'; @@ -555,8 +555,6 @@ OC.Upload = { throw t('files', 'URL cannot be empty'); } else if (type !== 'web' && !Files.isFileNameValid(filename)) { // Files.isFileNameValid(filename) throws an exception itself - } else if (FileList.getCurrentDirectory() === '/' && filename.toLowerCase() === 'shared') { - throw t('files', 'In the home folder \'Shared\' is a reserved filename'); } else if (FileList.inList(filename)) { throw t('files', '{new_name} already exists', {new_name: filename}); } else { |