diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-07 12:53:42 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-07 13:06:50 +0100 |
| commit | af7366cd30f0df27cc1043f2c2b55def836d03db (patch) | |
| tree | 1c62f2162b68e9bb57000cb1f84a7becd4666c7f | |
| parent | be47e156a5afee8a20f60d278aab45bb84c282c2 (diff) | |
| download | nextcloud-server-af7366cd30f0df27cc1043f2c2b55def836d03db.tar.gz nextcloud-server-af7366cd30f0df27cc1043f2c2b55def836d03db.zip | |
Only add files to file list when uploading to current directory
Fix Issue #6683
| -rw-r--r-- | apps/files/ajax/upload.php | 6 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 8f6c42d6620..754c34ef088 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -139,7 +139,8 @@ if (strpos($dir, '..') === false) { 'originalname' => $files['tmp_name'][$i], 'uploadMaxFilesize' => $maxUploadFileSize, 'maxHumanFilesize' => $maxHumanFileSize, - 'permissions' => $meta['permissions'] & $allowedPermissions + 'permissions' => $meta['permissions'] & $allowedPermissions, + 'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)), ); } @@ -166,7 +167,8 @@ if (strpos($dir, '..') === false) { 'originalname' => $files['tmp_name'][$i], 'uploadMaxFilesize' => $maxUploadFileSize, 'maxHumanFilesize' => $maxHumanFileSize, - 'permissions' => $meta['permissions'] & $allowedPermissions + 'permissions' => $meta['permissions'] & $allowedPermissions, + 'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)), ); } } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index f538af10362..e6aefd33c96 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -924,8 +924,8 @@ $(document).ready(function() { data.context.find('td.filesize').text(humanFileSize(size)); } else { - // only append new file if dragged onto current dir's crumb (last) - if (data.context && data.context.hasClass('crumb') && !data.context.hasClass('last')) { + // only append new file if uploaded into the current folder + if (file.directory !== FileList.getCurrentDirectory()) { return; } |