[Pkg-owncloud-commits] [owncloud] 01/50: Prevent folder upload causing unexpected behavior

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit be07def0afa23d234ce7575013a8bcb7c113d5d1
Author: Robin Appelman <icewind at owncloud.com>
Date:   Thu Aug 7 15:43:38 2014 +0200

    Prevent folder upload causing unexpected behavior
---
 apps/files/js/file-upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 93da4bb..b25755e 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}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git